Changeset 5904

Timestamp:

01/12/07 09:10:58 (2 years ago)

Author:

bitsweat

Message:

Fix parsing of array[] CGI parameters so extra empty values aren't included. Closes #6252.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 [Nicholas Seckar, aiwilliams, brentrowland]
-
-* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, manfred, idrifter]

trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -24 +24 @@
-      parser = FormEncodedPairParser.new
-
-
-
-
+
+
-        for key, value in params
-
-
+
+
+
-            # much faster to test for the most common case first (GET)
-            # and avoid the call to build_deep_hash
-            parser.result[key] = get_typed_value(value[0])
+            params.delete key
-          elsif value.is_a?(Array)
-            parser.parse(key, get_typed_value(value.shift))
-finished = false unless
+params.delete key if
-          else
-            raise TypeError, "Expected array, found #{value.inspect}"

trunk/actionpack/test/controller/cgi_test.rb

@@ -426 +426 @@
-    assert_equal ["yes"], alt_cookies["is_admin"]
-  end
+  
+  def test_unbalanced_query_string_with_array
+   assert_equal(
+     {'location' => ["1", "2"], 'age_group' => ["2"]},
+  CGIMethods.parse_query_parameters("location[]=1&location[]=2&age_group[]=2")
+   )
+   assert_equal(
+     {'location' => ["1", "2"], 'age_group' => ["2"]},
+     CGIMethods.parse_request_parameters({'location[]' => ["1", "2"],
+  'age_group[]' => ["2"]})
+   )
+  end
-end