From 30e628a47fce4857aca0a4d80bed59ddc2f5c481 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 18 Jul 2009 08:12:45 +0000 Subject: [PATCH] Unneccessary code removed --- .../command/console/class_ConsoleCommandResolver.php | 5 +---- .../resolver/command/image/class_ImageCommandResolver.php | 5 +---- .../main/resolver/command/web/class_WebCommandResolver.php | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php index 5dffd576..b3903d6a 100644 --- 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 633a6233..9dca5ec9 100644 --- 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 f4eba121..cb23dd1b 100644 --- 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 -- 2.39.5