Rewritten a lot double-quotes to single-requotes, removed deprecated exception, some...

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

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 06ba1118e8a8739c4a3a526aa3592b2eb1937c81..297a40c2ccaf977b1419a623ce0e818c0efbbcef 100644 (file)
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -133,9 +133,10 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
                if ($controllerName != $defaultController) {
                        // Create controller class name
-                       $this->setClassName(sprintf("Web%sController",
-                               $this->convertToClassName($controllerName)
-                       ));
+                       $className = 'Web' . $this->convertToClassName($controllerName) . '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');
@@ -163,15 +164,22 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                        $resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
                } catch (ConfigEntryNotFoundException $e) {
                        // Use default resolver entry
-                       $resolverConfigEntry = "web_cmd_resolver_class";
+                       // @TODO Maybe we need to log this?
+                       $resolverConfigEntry = 'web_cmd_resolver_class';
                }
 
                // Initiate the resolver and controller
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName($resolverConfigEntry, array($controllerName, $this->getApplicationInstance()));
-               $controllerInstance = ObjectFactory::createObjectByName($this->getClassName(), array($resolverInstance));
-
-               // Remove resolver (we don't need it anymore)
-               unset($resolverInstance);
+               $resolverInstance = ObjectFactory::createObjectByConfiguredName(
+                       $resolverConfigEntry,
+                       array(
+                               $controllerName,
+                               $this->getApplicationInstance()
+                       )
+               );
+               $controllerInstance = ObjectFactory::createObjectByName(
+                       $this->getClassName(),
+                       array($resolverInstance)
+               );
 
                // Return the result
                return $controllerInstance;