Merge pull request #1710 from wallabag/v2-message-graby-fails

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / ConfigController.php

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 87196b0ec3f2bb9d1794069a46dd24c2237be49d..1791eac23719e09ba34929ab0dd36ef162599107 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -58,20 +58,16 @@ class ConfigController extends Controller
 
         if ($pwdForm->isValid()) {
             if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
-                $this->get('session')->getFlashBag()->add(
-                    'notice',
-                    'In demonstration mode, you can\'t change password for this user.'
-                );
+                $message = 'In demonstration mode, you can\'t change password for this user.';
             } else {
+                $message = 'Password updated';
+
                 $user->setPlainPassword($pwdForm->get('new_password')->getData());
                 $userManager->updateUser($user, true);
-
-                $this->get('session')->getFlashBag()->add(
-                    'notice',
-                    'Password updated'
-                );
             }
 
+            $this->get('session')->getFlashBag()->add('notice', $message);
+
             return $this->redirect($this->generateUrl('config').'#set4');
         }