Changeset 10591

Timestamp:

08/01/08 18:01:43 (1 year ago)

Author:

fabien

Message:

[1.1] fixed variable replacing in URL happens in wrong order (closes #4058)

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

@@ -559 +559 @@
-    // replace variables
-    $realUrl = $url;
-
+
+
+
+
-    {
-      $realUrl = str_replace($value, urlencode($tparams[$variable]), $realUrl);

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-5
+6
-
-class sfPatternRoutingTest extends sfPatternRouting
@@ -537 +537 @@
-$params = array('module' => 'default', 'action' => 'action', 'param1' => 'param1');
-$t->is($r->parse($url), $params, 'parse /customer/:param1/:action/* route');
+
+$r->clearRoutes();
+$r->connect('test', '/customer/:id/:id_name', array('module' => 'default'));
+$t->is($r->generate('', array('id' => 2, 'id_name' => 'fabien')), '/customer/2/fabien', '->generate() first replaces the longest variable names');