diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-02-05 08:36:24 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-02-05 08:36:24 +0400 |
| commit | d022d80bbdbde983f29abe13d658ec74e505aa5a (patch) | |
| tree | 992ade9dd29fb1f7deabb6d14a339dedcb5c5a40 | |
| parent | 87fb6bed179cfd2a94b2de3f88f8b32321cd8659 (diff) | |
| parent | b1118efc1ed53dbabfe7aac93038ba08400beb57 (diff) | |
Merge remote-tracking branch 'origin/master'2.0.4-b9
| -rw-r--r-- | core/Access.php | 2 | ||||
| -rw-r--r-- | plugins/Login/Controller.php | 4 | ||||
| -rwxr-xr-x | plugins/Login/templates/resetPassword.twig | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core/Access.php b/core/Access.php index d5d4e4acc5..e01753abbb 100644 --- a/core/Access.php +++ b/core/Access.php @@ -468,7 +468,7 @@ class Access private function setAnySuperUserLoginIfCurrentUserHasNotSuperUserAccess() { - if (!Piwik::hasTheUserSuperUserAccess($this->login)) { + if (!Piwik::hasTheUserSuperUserAccess($this->login) || Piwik::isUserIsAnonymous()) { $this->login = $this->getAnySuperUserAccessLogin(); } } 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> |