Changeset 2873

Timestamp:

11/24/08 20:58:06 (6 weeks ago)

Author:

rickc

Message:

Fixes for the installhandler to cope with the changes wrought by SuperGlobal. All props to scoates for the patches.

Location:

trunk/htdocs/system/classes

Files:

• actionhandler.php (modified) (2 diffs)
• installhandler.php (modified) (1 diff)

trunk/htdocs/system/classes/actionhandler.php

@@ -20 +20 @@
      * Internal array of handler variables (state info)
      *
-     * @var array
+     * @var SuperGlobal
      */
-    public $handler_vars = array();
+    public $handler_vars = null;
 
     /**
@@ -33 +33 @@
      */
     public function act($action) {
+        if (null === $this->handler_vars) {
+            $this->handler_vars = new SuperGlobal(array());
+        }
         $this->action = $action;
 

trunk/htdocs/system/classes/installhandler.php

@@ -702 +702 @@
             return false;
         }
-        $vars = array_map('addslashes', $this->handler_vars);
+
+        $vars = array();
+        foreach ($this->handler_vars as $k => $v) {
+            $vars[$k] = addslashes($v);
+        }
+        $keys = array();
+        foreach (array_keys($vars) as $v) {
+            $keys[] = Utils::map_array($v);
+        }
+
         $file_contents = str_replace(
-            array_map(array('Utils', 'map_array'), array_keys($vars)),
+            $keys,
             $vars,
             $file_contents