From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 10 Oct 2010 09:23:38 +0000 (+0200)
Subject: Fix deprecated references to XorgDBIterator (renamed to XDBIterator).
X-Git-Tag: core/1.1.1~9
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b00a702a623367b9647e12732a2533f65871cf3c;p=platal.git

Fix deprecated references to XorgDBIterator (renamed to XDBIterator).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/plpage.php b/classes/plpage.php
index 258a8c3..1fbbe23 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -374,7 +374,7 @@ abstract class PlPage extends Smarty
             $this->jsonAssign('pl_errors', join("\n", $GLOBALS['pl_errors']));
             $GLOBALS['pl_errors'] = array();
         }
-        array_walk_recursive($this->_jsonVars, "escape_xorgDB");
+        array_walk_recursive($this->_jsonVars, "escape_XDB");
         $jsonbegin = Env::v('jsonBegin');
         $jsonend = Env::v('jsonEnd');
         if (Env::has('jsonVar')) {
@@ -397,9 +397,9 @@ abstract class PlPage extends Smarty
     // }}}
 }
 
-function escape_xorgDB(&$item, $key)
+function escape_XDB(&$item, $key)
 {
-    if ($item instanceof XOrgDBIterator) {
+    if ($item instanceof XDBIterator) {
         $expanded = array();
         while ($a = $item->next()) {
             $expanded[] = $a;