merge r31167 from branch 2.7 to trunk

bug 3223 fixed: make sure we have found a user before validating the connection


git-svn-id: http://piwigo.org/svn/trunk@31168 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2015-05-15 12:45:50 +00:00
parent a1b995686b
commit e520cf8389
+1 -1
View File
@@ -1116,7 +1116,7 @@ SELECT '.$conf['user_fields']['id'].' AS id,
WHERE '.$conf['user_fields']['username'].' = \''.pwg_db_real_escape_string($username).'\'
;';
$row = pwg_db_fetch_assoc(pwg_query($query));
if ($conf['password_verify']($password, $row['password'], $row['id']))
if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id']))
{
log_user($row['id'], $remember_me);
trigger_notify('login_success', stripslashes($username));