GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Mikael Nordfeldth 2015-12-14 21:45:46 +01:00
parent 20592f184d c114c6bbad
commit 289116cb64
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/installer.php
View File

@ -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;
}

2
scripts/setpassword.php
View File

@ -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";