Author: jablko
Date: Sat Oct 10 16:34:46 2009
New Revision: 3718

Log:
Avoid using same cache key for parameters which generate different URLs, 
http://trac.symfony-project.org/ticket/7304

Modified:
   trunk/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php

Modified: trunk/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php
==============================================================================
--- trunk/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php     Sat Oct 
10 16:32:26 2009        (r3717)
+++ trunk/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php     Sat Oct 
10 16:34:46 2009        (r3718)
@@ -366,7 +366,7 @@
     // fetch from cache
     if (!is_null($this->cache))
     {
-      $cacheKey = 
'generate_'.$name.'_'.md5(serialize(array_merge($this->defaultParameters, 
$params))).'_'.md5(serialize($this->options['context']));
+      $cacheKey = 
'generate_'.$name.'_'.md5(serialize(array($this->defaultParameters, 
$params))).'_'.md5(serialize($this->options['context']));
       if ($this->options['lookup_cache_dedicated_keys'] && $url = 
$this->cache->get('symfony.routing.data.'.$cacheKey))
       {
         return $this->fixGeneratedUrl($url, $absolute);

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to