From d8fe42e3497cc2ee9a9062cb9a6f8b438b9a313b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 6 Apr 2015 11:49:26 +0200 Subject: [PATCH] 'page' and 'command' were both the same (command), so better name it same way. Signed-off-by: Roland Haeder --- application/city/class_ApplicationHelper.php | 15 +++------------ .../templates/de/menu/generic_menu_entries.xml | 12 ++++++------ core | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php index fc1a3c9..f713acb 100644 --- a/application/city/class_ApplicationHelper.php +++ b/application/city/class_ApplicationHelper.php @@ -177,24 +177,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica $this->setResponseInstance($responseInstance); // Get the parameter from the request - $commandName = $requestInstance->getRequestElement('page'); + $commandName = $requestInstance->getRequestElement('command'); // If it is null then get default command if (is_null($commandName)) { // Get default command - $commandName = $responseInstance->getDefaultCommand(); - - // Default is 'page' - $element = 'page'; - - // Is the request type console? - if ($responseType === 'console') { - // Console applications have only commands - $element = 'command'; - } // END - if + $commandName = $responseInstance->determineDefaultCommand(); // Set it in request - $requestInstance->setRequestElement($element, $commandName); + $requestInstance->setRequestElement('command', $commandName); } // END - if // Get a controller resolver diff --git a/application/city/templates/de/menu/generic_menu_entries.xml b/application/city/templates/de/menu/generic_menu_entries.xml index be42cd2..c25abc0 100644 --- a/application/city/templates/de/menu/generic_menu_entries.xml +++ b/application/city/templates/de/menu/generic_menu_entries.xml @@ -47,7 +47,7 @@ along with this program. If not, see - + @@ -56,7 +56,7 @@ along with this program. If not, see - + @@ -65,7 +65,7 @@ along with this program. If not, see - + @@ -74,7 +74,7 @@ along with this program. If not, see - + @@ -99,7 +99,7 @@ along with this program. If not, see - + @@ -108,7 +108,7 @@ along with this program. If not, see - + diff --git a/core b/core index b06a104..3b3947b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b06a10407c5515a96a2905f4cfffa5894d2862dc +Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d -- 2.39.5