'page' and 'command' were both the same (command), so better name it same way.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php
index fc1a3c9242fd64ab8ab08bca08264820312800c1..f713acb0a17376e0d35add3e5425406740e146f9 100644 (file)
--- 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 be42cd237a4f157d9b60c81680cad0a1e4148764..c25abc03678f3493cb06968d0e26ddeb216f6fd6 100644 (file)
--- 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?}&amp;page=login]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;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?}&amp;page=register]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;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[&Uuml;ber dieses Spiel]]></anchor-title>
-                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=infos]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;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?}&amp;page=pillory]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;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?}&amp;page=imprint]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;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?}&amp;page=terms]]></anchor-href>
+                                               <anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=terms]]></anchor-href>
                                        </anchor>
                                </entry>
                        </entry-list>

diff --git a/core b/core
index b06a10407c5515a96a2905f4cfffa5894d2862dc..3b3947b86b38904aa1100b54846c14d3b31cb97d 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b06a10407c5515a96a2905f4cfffa5894d2862dc
+Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d