Continued:

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

diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 3d3188978eb26655a78da3de0ba308774c666f88..6f2da6fe4d2f174726b4dd8481b0c9a1bb3d4c6b 100644 (file)
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -73,7 +73,12 @@ class BaseControllerResolver extends BaseResolver {
                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BEFORE: controller=' . $controllerName);
                if ($controllerName != $defaultController) {
                        // Create controller class name
-                       $className = $this->getCapitalizedClassPrefix() . self::convertToClassName($controllerName) . 'Controller';
+                       $className = sprintf(
+                               '%s\%s%sController',
+                               $namespace,
+                               $this->getCapitalizedClassPrefix(),
+                               self::convertToClassName($controllerName)
+                       );
 
                        // ... and set it
                        $this->setClassName($className);
@@ -124,7 +129,7 @@ class BaseControllerResolver extends BaseResolver {
         * @throws      EmptyVariableException          Thrown if given controller is not set
         * @throws      DefaultControllerException      Thrown if default controller was not found
         */
-       public function isControllerValid ($namespace, $controllerName) {
+       protected function isControllerValid ($namespace, $controllerName) {
                // By default nothing shall be valid
                $isValid = FALSE;