Merge pull request #5 from PROCERGS/issue#4

Fixes email badge
PROCERGS · Sep 27, 2016 · 5bae948 · 5bae948
2 parents 177241d + 952095d
commit 5bae948
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /nbproject
+/.idea
 /.project
 /.buildpath
 /.settings/
diff --git a/Event/BadgesSubscriber.php b/Event/BadgesSubscriber.php
@@ -71,7 +71,7 @@ protected function checkCpf(EvaluateBadgesEvent $event)
     protected function checkEmail(EvaluateBadgesEvent $event)
     {
         $person = $event->getPerson();
-        if ($person->getEmailConfirmedAt() instanceof \DateTime && !$person->getConfirmationToken()) {
+        if ($person->getEmailConfirmedAt() instanceof \DateTime) {
             $event->registerBadge($this->getBadge('valid_email', true));
         }
     }
@@ -99,7 +99,6 @@ protected function countValidEmail()
         return $this->em->getRepository('LoginCidadaoCoreBundle:Person')
                 ->createQueryBuilder('p')
                 ->select('COUNT(p)')
-                ->andWhere('p.confirmationToken IS NULL')
                 ->andWhere('p.emailConfirmedAt IS NOT NULL')
                 ->getQuery()->getSingleScalarResult();
     }