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

[core.git] / inc / classes / main / resolver / controller / web / class_WebControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 65dc4d92ea21078fec5f156a6ce9ed08bd74b0c5..a941f53c2309c7cb6991779847491f0c7fc3408e 100644 (file)
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -127,7 +127,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                $controllerInstance = null;
 
                // Default controller
-               $this->setClassName('WebDefaultController');
+               $this->setClassName('WebDefaultNewsController');
 
                // Generate the class name
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
@@ -137,12 +137,9 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 
                        // ... 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('WebDefaultNewsController');
                } else {
                        // No news at home page or non-news page
-                       $this->setClassName('WebDefaultController');
+                       $this->setClassName('WebDefaultNewsController');
                }
                //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";