From: Roland Haeder Date: Mon, 6 Apr 2015 09:53:11 +0000 (+0200) Subject: 'page' and 'command' were both the same (command), so better name it same way. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=be779b8cf9efd3d7217e7ebe83bd6e156ecc1c72;p=install.git 'page' and 'command' were both the same (command), so better name it same way. Signed-off-by: Roland Haeder --- diff --git a/application/install/class_ApplicationHelper.php b/application/install/class_ApplicationHelper.php index 7c71641..f77ca74 100644 --- a/application/install/class_ApplicationHelper.php +++ b/application/install/class_ApplicationHelper.php @@ -200,7 +200,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication $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)) { @@ -208,7 +208,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication $commandName = $responseInstance->getDefaultCommand(); // Set it in request - $requestInstance->setRequestElement('page', $commandName); + $requestInstance->setRequestElement('command', $commandName); } // END - if // Get a controller resolver diff --git a/application/install/templates/de/emails/text_resend_link.tpl b/application/install/templates/de/emails/text_resend_link.tpl index e764146..b5695b0 100644 --- a/application/install/templates/de/emails/text_resend_link.tpl +++ b/application/install/templates/de/emails/text_resend_link.tpl @@ -11,7 +11,7 @@ Du (oder ein anderer) hattest soeben deinen Bestätigungslink erneut angefor Hier ist nun dein Bestätigungslink. Der alte aus der Anmeldemail ist somit nicht mehr gültig! -$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?} +$config[base_url]/index.php?app={?app_short_name?}&command=confirm&username={?username?}&confirm={?confirm_hash?} Solltest du die URL nicht anklicken können, versuche diese in die Adresszeile deines Browsers zu kopieren. diff --git a/core b/core index b84edaf..3b3947b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b84edaf9f45857dea7078c230cea0290089c0770 +Subproject commit 3b3947b86b38904aa1100b54846c14d3b31cb97d