Changeset 31168


Ignore:
Timestamp:
05/15/15 14:45:50 (4 years ago)
Author:
plg
Message:

merge r31167 from branch 2.7 to trunk

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/functions_user.inc.php

    r29840 r31168  
    11171117;'; 
    11181118  $row = pwg_db_fetch_assoc(pwg_query($query)); 
    1119   if ($conf['password_verify']($password, $row['password'], $row['id'])) 
     1119  if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id'])) 
    11201120  { 
    11211121    log_user($row['id'], $remember_me); 
Note: See TracChangeset for help on using the changeset viewer.