X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fclass_BaseControllerResolver.php;h=3d3188978eb26655a78da3de0ba308774c666f88;hp=fdcf6af03bcf740daeb17592b90818e4a45cda28;hb=9d7ec3e9729ea8a7a9418cf3f87a0e4bfcf4c3d5;hpb=cabd0c2cdd08b8eaf49197ea3fb370f60af53dc4

diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index fdcf6af0..3d318897 100644
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -3,10 +3,11 @@
 namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
+use CoreFramework\Controller\DefaultControllerException;
+use CoreFramework\Controller\Generic\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Resolver\BaseResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;
-
 /**
  * A generic controller resolver class
  *
@@ -46,13 +47,12 @@ class BaseControllerResolver extends BaseResolver {
 	 * controller was not found one of the default controllers will be used
 	 * depending on whether news shall be displayed.
 	 *
-	 * @param	$namespace				Namespace to look in
 	 * @param	$controllerName			A controller name we shall look for
 	 * @return	$controllerInstance		A loaded controller instance
 	 * @throws	InvalidControllerException	Thrown if even the requested
 	 *										controller class is missing (bad!)
 	 */
-	protected function loadController ($namespace, $controllerName) {
+	protected function loadController ($controllerName) {
 		// Cache default controller
 		$defaultController = $this->getConfigInstance()->getConfigEntry('default_' . strtolower($this->getClassPrefix()) . '_controller');
 
@@ -62,7 +62,7 @@ class BaseControllerResolver extends BaseResolver {
 		// Create full class name
 		$className = sprintf(
 			'%s\%sDefaultNewsController',
-			$namespace,
+			$this->getNamespace(),
 			$this->getCapitalizedClassPrefix()
 		);
 
@@ -150,7 +150,7 @@ class BaseControllerResolver extends BaseResolver {
 		);
 
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('className=%s', $className));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('className=%s', $className));
 
 		// Now, let us create the full name of the controller class
 		$this->setClassName($className);
@@ -188,11 +188,10 @@ class BaseControllerResolver extends BaseResolver {
 		$controllerInstance = NULL;
 
 		// Get namespace and controller name
-		$namespace      = $this->getNamespace();
 		$controllerName = $this->getControllerName();
 
 		// Get the controller
-		$controllerInstance = $this->loadController($namspace, $controllerName);
+		$controllerInstance = $this->loadController($controllerName);
 
 		// And validate it
 		if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) {