fixed mistake for no secret question @ password lost

kokspflanze · Oct 15, 2015 · b0dbec3 · b0dbec3
1 parent 4a3f9e2
commit b0dbec3
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/PServerCMS/Service/User.php b/src/PServerCMS/Service/User.php
@@ -225,7 +225,9 @@ public function lostPwConfirm( array $data, UserCodes $userCode )
         $form = $this->getPasswordForm();
         /** @var \PServerCMS\Form\PasswordFilter $filter */
         $filter = $form->getInputFilter();
-        $filter->addAnswerValidation( $userCode->getUser() );
+        if ($this->getEntityManagerAnswer()->getAnswer4UserId($userCode->getUser()->getId())) {
+            $filter->addAnswerValidation( $userCode->getUser() );
+        }
         $form->setData( $data );
         if (!$form->isValid()) {
             return false;
@@ -693,6 +695,14 @@ protected function handleAuth4UserLogin( SmallUserInterface $user )
         return parent::handleAuth4UserLogin($user);
     }
 
+    /**
+     * @return null|\PServerCMS\Entity\Repository\SecretAnswer
+     */
+    protected function getEntityManagerAnswer()
+    {
+        return $this->getEntityManager()->getRepository($this->getEntityOptions()->getSecretAnswer());
+    }
+
     /**
      * @param UserInterface $entity
      * @param string $plaintext