Rewrite continued:

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

diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index 3f906f9fd56e0765962c2f7ee479cc404033dce2..f2a3f3ec5e9dcd2d93ea173b998c3269858e7c87 100644 (file)
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -7,8 +7,10 @@ use CoreFramework\Controller\DefaultControllerException;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\EmptyVariableException;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Resolver\BaseResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;
+
 /**
  * A generic controller resolver class
  *
@@ -109,7 +111,7 @@ class BaseControllerResolver extends BaseResolver {
                        $resolverConfigEntry,
                        array(
                                $controllerName,
-                               $this->getApplicationInstance()
+                               Registry::getRegistry()->getInstance('app')
                        )
                );
                $controllerInstance = ObjectFactory::createObjectByName(
@@ -132,7 +134,7 @@ class BaseControllerResolver extends BaseResolver {
         */
        protected function isControllerValid ($namespace, $controllerName) {
                // By default nothing shall be valid
-               $isValid = FALSE;
+               $isValid = false;
 
                // Is namespace and controller name set?
                if (empty($namespace)) {
@@ -162,11 +164,11 @@ class BaseControllerResolver extends BaseResolver {
                $this->setClassName($className);
 
                // Try it hard to get an controller
-               while ($isValid === FALSE) {
+               while ($isValid === false) {
                        // Is this class already loaded?
                        if (class_exists($this->getClassName())) {
                                // This class does exist. :-)
-                               $isValid = TRUE;
+                               $isValid = true;
                        } elseif ($this->getClassName() != $newsControllerName) {
                                // Set default controller
                                $this->setClassName($newsControllerName);