diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-23 09:53:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 09:53:18 +0100 |
| commit | f4a98334903f01e6109b09e27dc1ebefab8f8865 (patch) | |
| tree | 91bc4aaa5bbebb141911477113d28ab00973603f /src/Wallabag | |
| parent | 75a4b3b23fcc183d926eb7cc782762085661b2da (diff) | |
| parent | fcbf253b6bc0772adaf0d0e7cc51de50046cf64e (diff) | |
| download | wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.gz wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.zst wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.zip | |
Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
Diffstat (limited to 'src/Wallabag')
| -rw-r--r-- | src/Wallabag/UserBundle/Repository/UserRepository.php | 2 | ||||
| -rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig (renamed from src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php index 445edb3c..f913f52d 100644 --- a/src/Wallabag/UserBundle/Repository/UserRepository.php +++ b/src/Wallabag/UserBundle/Repository/UserRepository.php | |||
| @@ -48,7 +48,7 @@ class UserRepository extends EntityRepository | |||
| 48 | { | 48 | { |
| 49 | return $this->createQueryBuilder('u') | 49 | return $this->createQueryBuilder('u') |
| 50 | ->select('count(u)') | 50 | ->select('count(u)') |
| 51 | ->andWhere('u.expired = false') | 51 | ->andWhere('u.enabled = true') |
| 52 | ->getQuery() | 52 | ->getQuery() |
| 53 | ->getSingleScalarResult(); | 53 | ->getSingleScalarResult(); |
| 54 | } | 54 | } |
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig index 66cbdc28..e9d46dcc 100644 --- a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | {% block fos_user_content %} | 5 | {% block fos_user_content %} |
| 6 | <div class="card-content"> | 6 | <div class="card-content"> |
| 7 | <div class="row"> | 7 | <div class="row"> |
| 8 | {{ 'resetting.check_email'|trans({'%email%': email}) }} | 8 | <p>{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}</p> |
| 9 | </div> | 9 | </div> |
| 10 | </div> | 10 | </div> |
| 11 | {% endblock fos_user_content %} | 11 | {% endblock fos_user_content %} |