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

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

diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index dc664e87cefa98684daee07b1cabb05f8fc8ee67..191609f6f3e5ae8c83a22ebe68b1526c2ec03553 100644 (file)
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@ -133,9 +133,10 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
                if ($controllerName != $defaultController) {
                        // Create controller class name
-                       $this->setClassName(sprintf("Image%sController",
-                               $this->convertToClassName($controllerName)
-                       ));
+                       $className = 'Image' . $this->convertToClassName($controllerName) . 'Controller';
+
+                       // ... and set it
+                       $this->setClassName($className);
                } // END - if
                //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
 
@@ -146,11 +147,17 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                } // END - if
 
                // Initiate the resolver and controller
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName('image_cmd_resolver_class', array($controllerName, $this->getApplicationInstance()));
-               $controllerInstance = ObjectFactory::createObjectByName($this->getClassName(), array($resolverInstance));
-
-               // Remove resolver
-               unset($resolverInstance);
+               $resolverInstance = ObjectFactory::createObjectByConfiguredName(
+                       'image_cmd_resolver_class',
+                       array(
+                               $controllerName,
+                               $this->getApplicationInstance()
+                       )
+               );
+               $controllerInstance = ObjectFactory::createObjectByName(
+                       $this->getClassName(),
+                       array($resolverInstance)
+               );
 
                // Return the result
                return $controllerInstance;