Browse Source

Merge pull request #6155 from ADmad/router

Apply url filters before merging current request's params.
Mark Story 11 years ago
parent
commit
80e2008d6e
1 changed files with 2 additions and 1 deletions
  1. 2 1
      src/Routing/Router.php

+ 2 - 1
src/Routing/Router.php

@@ -594,6 +594,8 @@ class Router
                 unset($url['_ssl']);
                 unset($url['_ssl']);
             }
             }
 
 
+            $url = static::_applyUrlFilters($url);
+
             if (!isset($url['_name'])) {
             if (!isset($url['_name'])) {
                 // Copy the current action if the controller is the current one.
                 // Copy the current action if the controller is the current one.
                 if (empty($url['action']) &&
                 if (empty($url['action']) &&
@@ -615,7 +617,6 @@ class Router
                 ];
                 ];
             }
             }
 
 
-            $url = static::_applyUrlFilters($url);
             $output = static::$_collection->match($url, static::$_requestContext + ['params' => $params]);
             $output = static::$_collection->match($url, static::$_requestContext + ['params' => $params]);
         } else {
         } else {
             $plainString = (
             $plainString = (