Changeset 7707

Timestamp:

03/01/08 14:52:09 (1 year ago)

Author:

fabien

Message:

fixed value decoding in sfPatternRouting

Files:

• branches/1.1/lib/routing/sfPatternRouting.class.php (modified) (1 diff)
• branches/1.1/test/unit/routing/sfPatternRoutingTest.php (modified) (2 diffs)

branches/1.1/lib/routing/sfPatternRouting.class.php

@@ -633 +633 @@
-        if (!is_int($key))
-        {
-$value
+urldecode($value)
-        }
-      }

branches/1.1/test/unit/routing/sfPatternRoutingTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-5
+7
-
-class sfPatternRoutingTest extends sfPatternRouting
@@ -501 +501 @@
-$t->is($r->parse('/'), $params, '->parse()    overrides the default module/action if provided in the defaults');
-$t->is($r->generate('', $params), '/', '->generate() overrides the default module/action if provided in the defaults');
+
+// parameter values decoding
+$t->diag('parameter values decoding');
+$r->clearRoutes();
+$r->connect('test', '/test/:value', array('module' => 'default', 'action' => 'index'));
+$r->connect('test1', '/test1/*', array('module' => 'default', 'action' => 'index'));
+$t->is($r->parse('/test/test%26foo%3Dbar%2Bfoo'), array('module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'), '->parse() decodes parameter values');
+$t->is($r->parse('/test1/value/test%26foo%3Dbar%2Bfoo'), array('module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'), '->parse() decodes parameter values');