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 c67f501f0068e9e7e335a5ed0ab8367170cd840f..cf828e610c374c27bfcbcdd0804e4df7768abdcc 100644 (file)
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Controller\DefaultControllerException;
 use Org\Mxchange\CoreFramework\Controller\InvalidControllerException;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Resolver\BaseResolver;
 use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
@@ -88,9 +89,6 @@ abstract class BaseControllerResolver extends BaseResolver {
                // Cache default controller
                $defaultController = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_' . strtolower($this->getClassPrefix()) . '_controller');
 
-               // Init controller instance
-               $controllerInstance = NULL;
-
                // Create full class name
                $className = sprintf(
                        '%s\%sDefaultNewsController',
@@ -138,9 +136,11 @@ abstract class BaseControllerResolver extends BaseResolver {
                        $resolverConfigEntry,
                        array(
                                $controllerName,
-                               GenericRegistry::getRegistry()->getInstance('application')
+                               ApplicationHelper::getSelfInstance()
                        )
                );
+
+               // Get controller instance
                $controllerInstance = ObjectFactory::createObjectByName(
                        $this->getClassName(),
                        array($resolverInstance)
@@ -227,7 +227,6 @@ abstract class BaseControllerResolver extends BaseResolver {
        public function resolveController () {
                // Init variables
                $controllerName = $this->getControllerName();
-               $controllerInstance = NULL;
 
                // Get the controller
                $controllerInstance = $this->loadController($controllerName);