interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Kirby 3.3.2

Browse Source
This commit is contained in:
Bastian Allgeier
2019-12-17 10:31:21 +01:00
parent 3a82406bed
commit 91919964db
20 changed files with 361 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kirby/src/Cms/User.php
View File

@@ -272,7 +272,8 @@ class User extends ModelWithContent
}
/**
* Hashes user password
* Hashes the user's password unless it is `null`,
* which will leave it as `null`
*
* @internal
* @param string|null $password
@@ -281,11 +282,7 @@ class User extends ModelWithContent
public static function hashPassword($password): ?string
{
if ($password !== null) {
$info = password_get_info($password);
if ($info['algo'] === 0) {
$password = password_hash($password, PASSWORD_DEFAULT);
}
$password = password_hash($password, PASSWORD_DEFAULT);
}
return $password;
@@ -773,7 +770,7 @@ class User extends ModelWithContent
}
/**
* Sets and hashes a new user password
* Sets the user's password hash
*
* @param string $password
* @return self