@@ -75,7 +75,7 @@ |
||
| 75 | 75 | // rewrite local links |
| 76 | 76 | $content = preg_replace_callback( |
| 77 | 77 | '/\[(.*?)\]\((.*?)\)/', |
| 78 | - function ($match) use ($router, $moduleName, $raw) { |
|
| 78 | + function($match) use ($router, $moduleName, $raw) { |
|
| 79 | 79 | if (false === mb_strpos($match[2], '.md')) { |
| 80 | 80 | return $match[0]; |
| 81 | 81 | } |
@@ -77,7 +77,8 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $passwordEncoder = $this->encoderFactory->getEncoder(AuthenticationMappingEntity::class); |
| 79 | 79 | |
| 80 | - if (empty($user) || $user['uid'] <= 1) { // || !$passwordEncoder->isPasswordValid($user['pass'], $object['password'], null)) { |
|
| 80 | + if (empty($user) || $user['uid'] <= 1) { |
|
| 81 | +// || !$passwordEncoder->isPasswordValid($user['pass'], $object['password'], null)) { |
|
| 81 | 82 | $this->context |
| 82 | 83 | ->buildViolation($this->trans('Error! Could not login because the user could not be found. Please try again.')) |
| 83 | 84 | ->addViolation(); |
@@ -92,7 +93,8 @@ discard block |
||
| 92 | 93 | // new way |
| 93 | 94 | $passwordEncoder->isPasswordValid($user['pass'], $object['password'], null)) { |
| 94 | 95 | $validPassword = true; |
| 95 | - if ($passwordEncoder->needsRehash($user['pass'])) { // check to update hash to newer algo |
|
| 96 | + if ($passwordEncoder->needsRehash($user['pass'])) { |
|
| 97 | +// check to update hash to newer algo |
|
| 96 | 98 | $this->setPassword((int) $user['uid'], $object['password']); |
| 97 | 99 | } |
| 98 | 100 | } |