'page_with_news' is deprecated now

diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 964024dda6c630619366a3a3ee9ebcab10310744..ce2da51695c5c9f8389f0bdbee339bdc00f5ed14 100644 (file)
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@ -103,14 +103,8 @@ class BaseControllerResolver extends BaseResolver {
                                // This class does exist. :-)
                                $isValid = true;
                        } elseif (($this->getClassName() != $this->controllerPrefix.'DefaultController') && ($this->getClassName() != $this->controllerPrefix.'DefaultNewsController')) {
-                               // Do we have news?
-                               if ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) {
-                                       // Yes, display news in home then set default controller with news
-                                       $this->setClassName($this->controllerPrefix . 'DefaultNewsController');
-                               } else {
-                                       // No news at home page or non-news page
-                                       $this->setClassName($this->controllerPrefix . 'DefaultController');
-                               }
+                               // Set default controller
+                               $this->setClassName($this->controllerPrefix . 'DefaultController');
                        } else {
                                // All is tried, give it up here
                                throw new DefaultControllerException($this, self::EXCEPTION_DEFAULT_CONTROLLER_GONE);

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 65dc4d92ea21078fec5f156a6ce9ed08bd74b0c5..a3084103a9c9ea9b328a761fc8aa1032d16ce203 100644 (file)
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -137,9 +137,6 @@ 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');