diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 70a641f7a..662da2a08 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -261,28 +261,31 @@ class ConfigController extends Controller
*
* @Route("/account/delete", name="delete_account")
*
+ * @param Request $request
+ *
* @throws AccessDeniedHttpException
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- public function deleteAccountAction()
- {
- $enabledUsers = $this->getDoctrine()
- ->getRepository('WallabagUserBundle:User')
- ->getSumEnabledUsers();
+ public function deleteAccountAction(Request $request)
+ {
+ $enabledUsers = $this->getDoctrine()
+ ->getRepository('WallabagUserBundle:User')
+ ->getSumEnabledUsers();
- if ($enabledUsers <= 1) {
- throw new AccessDeniedHttpException();
- }
+ if ($enabledUsers <= 1) {
+ throw new AccessDeniedHttpException();
+ }
- $em = $this->get('fos_user.user_manager');
- $em->deleteUser($this->getUser());
+ $user = $this->getUser();
- $this->get('session')->getFlashBag()->add(
- 'notice',
- 'flashes.account.notice.account_deleted'
- );
+ // logout current user
+ $this->get('security.token_storage')->setToken(null);
+ $request->getSession()->invalidate();
- return $this->redirect($this->generateUrl('fos_user_security_logout'));
- }
+ $em = $this->get('fos_user.user_manager');
+ $em->deleteUser($user);
+
+ return $this->redirect($this->generateUrl('fos_user_security_login'));
+ }
}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a8a3f9dca..25d259b86 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -169,7 +169,15 @@
{% if enabled_users > 1 %}
- {{ 'config.form_user.delete_account' | trans }}
+
{{ 'config.delete.description'|trans }}
+ + {{ 'config.form_user.delete_account' | trans }} + +