Changeset 2623

Timestamp:

05/05/2008 10:32:08 AM (7 months ago)

Author:

Shadowhand

Message:

Changes to Kohana::

• Updated key_string_sey to handle ArrayObjects?
  
• Reversed the order of key_string() to match key_string_set()
  
• Changed calls to key_string() to match the new param order
  

This WILL cause brokenness! Update your calls to Kohana::key_string!

Files:

• trunk/system/core/Kohana.php (modified) (7 diffs)

trunk/system/core/Kohana.php

@@ -820 +820 @@
 
                 // Get the line from the language
-                $line = self::key_string($key, $language);
+                $line = self::key_string($language, $key);
 
                 // Return the key string as fallback
@@ -876 +876 @@
 
                 // Get the line from the language
-                $line = self::key_string($key, $locale);
+                $line = self::key_string($locale, $key);
 
                 // Return the key string as fallback
@@ -896 +896 @@
          * @return  void    if the key is not found
          */
-        public static function key_string($keys, $array)
+        public static function key_string($array, $keys)
         {
                 // No array to search
@@ -954 +954 @@
         public static function key_string_set( & $array, $keys, $fill = NULL)
         {
-                // This must always be an array
-                $array = (array) $array;
+                if (is_object($array) AND ($array instanceof ArrayObject))
+                {
+                        // Copy the array
+                        $array_copy = $array->getArrayCopy();
+
+                        // Is an object
+                        $array_object = TRUE;
+                }
+                else
+                {
+                        if ( ! is_array($array))
+                        {
+                                // Must always be an array
+                                $array = (array) $array;
+                        }
+
+                        // Copy is a reference to the array
+                        $array_copy =& $array;
+                }
 
                 if (empty($keys))
@@ -964 +981 @@
 
                 // Create reference to the array
-                $row =& $array;
+                $row =& $array_copy;
 
                 for ($i = 0, $end = count($keys) - 1; $i <= $end; $i++)
@@ -971 +988 @@
                         $key = $keys[$i];
 
-                        if ( ! isset($array[$key]))
+                        if ( ! isset($row[$key]))
                         {
                                 if (isset($keys[$i + 1]))
@@ -992 +1009 @@
                         // Go down a level, creating a new row reference
                         $row =& $row[$key];
+                }
+
+                if (isset($array_object))
+                {
+                        // Swap the array back in
+                        $array->exchangeArray($array_copy);
                 }
         }