refs #10778 mark routes intialized in setRouteCollection

cakephp · Mar 1, 2018 · d3fbbbc · d3fbbbc
1 parent 243211b
commit d3fbbbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Routing/Middleware/RoutingMiddleware.php b/src/Routing/Middleware/RoutingMiddleware.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Routing\Middleware;
 
-=======
 use Cake\Cache\Cache;
 use Cake\Core\Configure;
 use Cake\Core\PluginApplicationInterface;
@@ -74,10 +73,9 @@ protected function loadRoutes()
         if (!$this->app) {
             return;
         }
+
         $routeCollection = $this->buildRouteCollection();
         Router::setRouteCollection($routeCollection);
-        // Prevent routes from being loaded again
-        Router::$initialized = true;
     }
 
     /**

diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -1157,6 +1157,7 @@ public static function getRouteCollection()
     public static function setRouteCollection($routeCollection)
     {
         static::$_collection = $routeCollection;
+        Router::$initialized = true;
     }
 
     /**