From e066f12254d78ca4953f7137ef92c82c5f220267 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Mar 2015 16:04:36 +0100 Subject: [PATCH] Even more renamed 'web' -> 'html' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/resolver/command/web/class_ | 6 +++--- .../main/resolver/command/web/class_WebCommandResolver.php | 4 ++-- inc/classes/main/response/html/class_HtmlResponse.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/classes/main/resolver/command/web/class_ b/inc/classes/main/resolver/command/web/class_ index 8a9db58e..d96768ab 100644 --- a/inc/classes/main/resolver/command/web/class_ +++ b/inc/classes/main/resolver/command/web/class_ @@ -89,7 +89,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv $commandName = $requestInstance->getRequestElement('page'); // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); // Check if the command is valid if ($this->isCommandValid($commandName) === FALSE) { @@ -125,7 +125,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv $commandInstance = null; // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); // Check if the command is valid if ($this->isCommandValid($commandName) === FALSE) { @@ -150,7 +150,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv */ private function loadCommand ($commandName) { // Cache default command - $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_web_command'); + $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_html_command'); // Init command instance $commandInstance = null; diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php index f6a5af92..0ee2764d 100644 --- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php +++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php @@ -90,7 +90,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver // Is the command empty? Then fall back to default command if (empty($commandName)) { - $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); } // END - if // Check if command is valid @@ -128,7 +128,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver // Is the command empty? Then fall back to default command if (empty($commandName)) { - $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); } // END - if // Check if command is valid diff --git a/inc/classes/main/response/html/class_HtmlResponse.php b/inc/classes/main/response/html/class_HtmlResponse.php index 80b50e88..4a3da75b 100644 --- a/inc/classes/main/response/html/class_HtmlResponse.php +++ b/inc/classes/main/response/html/class_HtmlResponse.php @@ -209,7 +209,7 @@ class HtmlResponse extends BaseResponse implements Responseable { * @return $defaultCommand Default command for this response */ public function getDefaultCommand () { - $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_web_command'); + $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_html_command'); return $defaultCommand; } } -- 2.39.5