Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Login')
-rw-r--r--plugins/Login/Controller.php4
-rwxr-xr-xplugins/Login/templates/resetPassword.twig2
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index d0be126e6b..41b851c621 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -181,7 +181,6 @@ class Controller extends \Piwik\Plugin\Controller
* to confirm use.
*
* @param none
- * @return void
*/
function resetPassword()
{
@@ -223,8 +222,7 @@ class Controller extends \Piwik\Plugin\Controller
private function resetPasswordFirstStep($form)
{
$loginMail = $form->getSubmitValue('form_login');
- $token = $form->getSubmitValue('form_token');
- $password = $form->getSubmitValue('form_password');
+ $password = $form->getSubmitValue('form_password');
// check the password
try {
diff --git a/plugins/Login/templates/resetPassword.twig b/plugins/Login/templates/resetPassword.twig
index bd9cf4accc..4a4debe91d 100755
--- a/plugins/Login/templates/resetPassword.twig
+++ b/plugins/Login/templates/resetPassword.twig
@@ -1,7 +1,7 @@
{% if infoMessage is defined and infoMessage is not empty %}
<p class="message">{{ infoMessage }}</p>
{% endif %}
-{% if formErrors is defined %}
+{% if formErrors is defined and formErrors is not empty %}
<p class="message_error">
{% for data in formErrors %}
<strong>{{ 'General_Error'|translate }}</strong>