aboutsummaryrefslogtreecommitdiffstats
path: root/include/account.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-03-22 09:29:23 +0000
committerMario <mario@mariovavti.com>2021-03-22 09:29:23 +0000
commit02d4c5ac90b20a2019e3401be233b9d92d41d4e7 (patch)
tree76a464e4f055d95b8760b2d8e9e3d4c5cb1fbcc9 /include/account.php
parenta18e297a2650e75ba35d0a81dac4c7222e076f40 (diff)
parent13355d42f71e72c67e6cd993ee13f427a69c0eee (diff)
downloadvolse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.tar.gz
volse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.tar.bz2
volse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.zip
Merge branch 'air' of https://framagit.org/hubzilla/core into air
Diffstat (limited to 'include/account.php')
-rw-r--r--include/account.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/account.php b/include/account.php
index c3c7d26b7..858c915e0 100644
--- a/include/account.php
+++ b/include/account.php
@@ -327,8 +327,9 @@ function create_account_from_register($arr) {
$roles = ACCOUNT_ROLE_ADMIN;
}
- $salt = random_string(32);
- $password_encoded = hash('whirlpool', $salt . (hex2bin($register[0]['reg_pass'])));
+ $password_parts = explode(',', $register[0]['reg_pass']);
+ $salt = $password_parts[0];
+ $password_encoded = $password_parts[1];
$ri = q(
"INSERT INTO account ("