Changeset 1071

Timestamp:

11/09/2007 09:14:16 PM (11 months ago)

Author:

Shadowhand

Message:

Updated URI::construct() to properly handle arrays in the GET string.

Files:

• trunk/system/libraries/URI.php (modified) (1 diff)

trunk/system/libraries/URI.php

@@ -22 +22 @@
                         foreach($_GET as $key => $val)
                         {
-                                self::$query_string .= $key.'='.rawurlencode($val);
+                                if (is_array($val))
+                                {
+                                        foreach($val as $sub_key => $sub_val)
+                                        {
+                                                // Integer subkeys are numerically indexed arrays
+                                                $sub_key = is_int($sub_key) ? '[]' : '['.$sub_key.']';
+
+                                                self::$query_string .= $key.rawurlencode($sub_key).'='.rawurlencode($sub_val).'&';
+                                        }
+                                }
+                                else
+                                {
+                                        self::$query_string .= $key.'='.rawurlencode($val).'&';
+                                }
                         }
+
+                        // Remove the ending ampersand
+                        self::$query_string = rtrim(self::$query_string, '&');
                 }
         }