Now by default with news due to deprecation of 'page_with_news'

[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 31dd4681541c38dd450373994133a54cedb9811c..f5cbe43f18c7849a01a806011b74749ff136a835 100644 (file)
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -127,7 +127,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                $controllerInstance = null;
 
                // Default controller
                $controllerInstance = null;
 
                // Default controller

-               $this->setClassName('ConsoleDefaultController');
+               $this->setClassName('ConsoleDefaultNewsController');

 
                // Generate the class name
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
 
                // Generate the class name
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;


@@ -137,12 +137,9 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 
                        // ... and set it
                        $this->setClassName($className);
 
                        // ... and set it
                        $this->setClassName($className);

-               } elseif ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) {
-                       // Yes, display news in home then set default controller with news
-                       $this->setClassName('ConsoleDefaultNewsController');

                } else {
                } else {

-                       // No news at home page or non-news page
-                       $this->setClassName('ConsoleDefaultController');
+                       // No news at main command or non-news command
+                       $this->setClassName('ConsoleDefaultNewsController');

                }
                //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
 
                }
                //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";