From: Roland Häder <roland@mxchange.org>
Date: Sat, 18 Jul 2009 07:00:34 +0000 (+0000)
Subject: 'page_with_news' is deprecated now
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=90f2c8b789efbb9178ffd94ac9bd5851f2cd7f94;p=core.git

'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 964024dd..ce2da516 100644
--- 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 65dc4d92..a3084103 100644
--- 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');