From 3e16e310803bac2c31d7fd74579f24d957e5ac18 Mon Sep 17 00:00:00 2001 From: Chimo Date: Fri, 4 Dec 2015 15:22:58 +0000 Subject: [PATCH 1/2] installer::checkPrereqs bump PHP version to 5.5.0 --- lib/installer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/installer.php b/lib/installer.php index 29a4383302..738eb80472 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -96,8 +96,8 @@ abstract class Installer } } - if (version_compare(PHP_VERSION, '5.3.2', '<')) { - $this->warning('Require PHP version 5.3.2 or greater.'); + if (version_compare(PHP_VERSION, '5.5.0', '<')) { + $this->warning('Require PHP version 5.5.0 or greater.'); $pass = false; } From 10bb4cb6599d1760ddd6448db23a1d47ea246a5f Mon Sep 17 00:00:00 2001 From: Chimo Date: Fri, 4 Dec 2015 17:09:06 +0000 Subject: [PATCH 2/2] Fix /scripts/setpassword.php common_munge_password is expecting a Profile, we were passing a user_id. Thanks @aroque for the fix ( ref. #100 ) --- scripts/setpassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setpassword.php b/scripts/setpassword.php index 3e9f5c17ca..6908ef556a 100755 --- a/scripts/setpassword.php +++ b/scripts/setpassword.php @@ -50,7 +50,7 @@ if (!$user) { $original = clone($user); -$user->password = common_munge_password($password, $user->id); +$user->password = common_munge_password($password, $user->getProfile()); if (!$user->update($original)) { print "Error updating user '$nickname'.\n";