Author: jablko
Date: Tue Sep 15 10:12:17 2009
New Revision: 3303
Log:
Rollback 3302
Modified:
trunk/lib/vendor/symfony/lib/routing/sfRoute.class.php
Modified: trunk/lib/vendor/symfony/lib/routing/sfRoute.class.php
==============================================================================
--- trunk/lib/vendor/symfony/lib/routing/sfRoute.class.php Tue Sep 15
10:05:11 2009 (r3302)
+++ trunk/lib/vendor/symfony/lib/routing/sfRoute.class.php Tue Sep 15
10:12:17 2009 (r3303)
@@ -180,14 +180,11 @@
}
// check that $params does not override a default value that is not a
variable
- if (isset($this->params))
+ foreach ($this->params as $key => $value)
{
- foreach ($this->params as $key => $value)
+ if (!isset($this->variables[$key]) && $tparams[$key] != $value)
{
- if (!isset($this->variables[$key]) && $tparams[$key] != $value)
- {
- return false;
- }
+ return false;
}
}
@@ -234,7 +231,7 @@
{
$url = str_replace($value, urlencode($tparams[$variable]), $url);
}
-
+
if(!in_array($this->suffix, $this->options['segment_separators']))
{
$url .= $this->suffix;
@@ -533,7 +530,7 @@
throw new InvalidArgumentException(sprintf('Unable to parse "%s" route
near "%s".', $this->pattern, $buffer));
}
}
-
+
// check for suffix
if ($this->suffix)
{
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
