Index: branches/5.3.x/core/kernel/application.php =================================================================== diff -u -N -r16163 -r16171 --- branches/5.3.x/core/kernel/application.php (.../application.php) (revision 16163) +++ branches/5.3.x/core/kernel/application.php (.../application.php) (revision 16171) @@ -1,6 +1,6 @@ UnitConfigReader = $this->makeClass('kUnitConfigReader'); - $this->UnitConfigReader->scanModules(MODULES_PATH); // will also set RewriteListeners when existing cache is read + $this->UnitConfigReader->scanModules(MODULES_PATH); // Will also set routers. $this->registerModuleConstants(); @@ -356,7 +355,7 @@ $this->ValidateLogin(); // must be called before AfterConfigRead, because current user should be available there - $this->UnitConfigReader->AfterConfigRead(); // will set RewriteListeners when missing cache is built first time + $this->UnitConfigReader->AfterConfigRead(); if ( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Processed AfterConfigRead'); @@ -2935,7 +2934,7 @@ $this->EventManager->setFromCache($data); $this->ReplacementTemplates = $data['Application.ReplacementTemplates']; - $this->RewriteListeners = $data['Application.RewriteListeners']; + $this->routers = $data['Application.Routers']; $this->ModuleInfo = $data['Application.ModuleInfo']; } @@ -2954,7 +2953,7 @@ $this->EventManager->getToCache(), Array ( 'Application.ReplacementTemplates' => $this->ReplacementTemplates, - 'Application.RewriteListeners' => $this->RewriteListeners, + 'Application.Routers' => $this->routers, 'Application.ModuleInfo' => $this->ModuleInfo, ) );