Unneccessary code removed

diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
index 5dffd57696fbc9374ef9b212f93c0ebc1b5771f5..b3903d6a228c5f9c693e0124b84b26b18d1e2a74 100644 (file)
--- a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
@@ -149,9 +149,6 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
         *                                                                              command class is missing (bad!)
         */
        private function loadCommand ($commandName) {
-               // Cache default command
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_console_command');
-
                // Init command instance
                $commandInstance = null;
 
@@ -164,7 +161,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
-                       throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+                       throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if
 
                // Initiate the command

diff --git a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index 633a6233f49db4c75309cf53e564e19b6e3cb397..9dca5ec97de1cfcc1a2ad68de43302c6ff28fe39 100644 (file)
--- a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@ -149,9 +149,6 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
         *                                                                              command class is missing (bad!)
         */
        private function loadCommand ($commandName) {
-               // Cache default command
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_image_command');
-
                // Init command instance
                $commandInstance = null;
 
@@ -161,7 +158,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
-                       throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+                       throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if
 
                // Initiate the command

diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index f4eba1210c43473119c1ba5c3fbbc39e28e74611..cb23dd1b526e69ae1728684f1019a1d8ea6c4dc7 100644 (file)
--- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@ -149,9 +149,6 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
         *                                                                              command class is missing (bad!)
         */
        private function loadCommand ($commandName) {
-               // Cache default command
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
-
                // Init command instance
                $commandInstance = null;
 
@@ -164,7 +161,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
-                       throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+                       throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if
 
                // Initiate the command