No 'page' in console

[core.git] / inc / classes / main / resolver / controller / console / class_ConsoleControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index 94e1445bc30043d02cae60f0440a606b1bf1b088..f241061ceddff3a4ddd31cf7e26e1ae3ff412f7b 100644 (file)
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -121,7 +121,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
         */
        private function loadController ($controllerName) {
                // Cache default command
-               $defaultController = $this->getConfigInstance()->readConfig('default_web_command');
+               $defaultController = $this->getConfigInstance()->readConfig('default_console_command');
 
                // Init controller instance
                $controllerInstance = null;
@@ -137,7 +137,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 
                        // ... and set it
                        $this->setClassName($className);
-               } elseif ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) {
+               } elseif ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('command')) {
                        // Yes, display news in home then set default controller with news
                        $this->setClassName('ConsoleDefaultNewsController');
                } else {
@@ -158,14 +158,14 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                // Try to read a config entry for our resolver including controller name... ;-)
                try {
                        // Create the resolver name
-                       $resolverConfigEntry = sprintf("web_cmd_%s_resolver_class", strtolower($controllerName));
+                       $resolverConfigEntry = sprintf("console_cmd_%s_resolver_class", strtolower($controllerName));
 
                        // Get the config, this will throw an exception if there is no special command resolver
                        $resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
                } catch (ConfigEntryNotFoundException $e) {
                        // Use default resolver entry
                        // @TODO Maybe we need to log this?
-                       $resolverConfigEntry = 'web_cmd_resolver_class';
+                       $resolverConfigEntry = 'console_cmd_resolver_class';
                }
 
                // Initiate the resolver and controller