Changeset 6614

Timestamp:

12/20/07 15:51:15 (10 months ago)

Author:

noel

Message:

fixed magic_quotes_gpc() handling in sfRouting (closes #1801)

Files:

• branches/1.0/lib/controller/sfRouting.class.php (modified) (1 diff)
• branches/1.0/test/unit/controller/sfRoutingTest.php (modified) (1 diff)

branches/1.0/lib/controller/sfRouting.class.php

@@ -581 +581 @@
-              $found .= $pass[$i].'='.$pass[$i + 1].'&';
-            }
+
-            parse_str($found, $pass);
+
+            if (get_magic_quotes_gpc())
+            {
+              $pass = sfToolkit::stripslashesDeep((array) $pass);
+            }
+            
-            foreach ($pass as $key => $value)
-            {

branches/1.0/test/unit/controller/sfRoutingTest.php

@@ -207 +207 @@
-$t->is($r->generate('', $params), $url, '->generate() takes the first matching route but takes * into accounts');
-
+$t->is($r->parse('/default/index/foo/bar\'123'), array('module' => 'default', 'action' => 'index', 'foo' => 'bar\'123'), '->parse() handles quotes');
+
+
-// * in the middle
-$r->clearRoutes();