Commit 289116cb authored by mmn's avatar mmn

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

parents 20592f18 c114c6bb
......@@ -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;
}
......
......@@ -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";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment