From d8fe42e3497cc2ee9a9062cb9a6f8b438b9a313b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
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 <roland@mxchange.org>
---
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 <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_login]]></anchor-id>
<anchor-text><![CDATA[Einloggen]]></anchor-text>
<anchor-title><![CDATA[Zum Spiel {?app_full_name?} einloggen]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=login]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=login]]></anchor-href>
</anchor>
</entry>
<entry>
@@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_register]]></anchor-id>
<anchor-text><![CDATA[Anmeldung]]></anchor-text>
<anchor-title><![CDATA[Zur Anmeldeseite]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=register]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=register]]></anchor-href>
</anchor>
</entry>
<entry>
@@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_infos]]></anchor-id>
<anchor-text><![CDATA[Informationen]]></anchor-text>
<anchor-title><![CDATA[Über dieses Spiel]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=infos]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=infos]]></anchor-href>
</anchor>
</entry>
<entry>
@@ -74,7 +74,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_pillory]]></anchor-id>
<anchor-text><![CDATA[Pranger]]></anchor-text>
<anchor-title><![CDATA[Zum Pranger]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=pillory]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=pillory]]></anchor-href>
</anchor>
</entry>
</entry-list>
@@ -99,7 +99,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_imprint]]></anchor-id>
<anchor-text><![CDATA[Impressum]]></anchor-text>
<anchor-title><![CDATA[Impressum]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=imprint]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=imprint]]></anchor-href>
</anchor>
</entry>
<entry>
@@ -108,7 +108,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
<anchor-id><![CDATA[menu_terms]]></anchor-id>
<anchor-text><![CDATA[ANBs]]></anchor-text>
<anchor-title><![CDATA[Allgemeine Nutzungsbedingungen (=ANBs)]]></anchor-title>
- <anchor-href><![CDATA[index.php?app={?app_short_name?}&page=terms]]></anchor-href>
+ <anchor-href><![CDATA[index.php?app={?app_short_name?}&command=terms]]></anchor-href>
</anchor>
</entry>
</entry-list>
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