diff options
| -rw-r--r-- | lib/class/vauth.class.php | 5 | ||||
| -rw-r--r-- | lib/debug.lib.php | 2 | ||||
| -rw-r--r-- | login.php | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/class/vauth.class.php b/lib/class/vauth.class.php index d8033b36..761e5a65 100644 --- a/lib/class/vauth.class.php +++ b/lib/class/vauth.class.php @@ -484,6 +484,10 @@ class vauth { return false; } + // This has to still be here because lots of people use old_password in their config file + $sql = "SELECT `password` FROM `user` WHERE `username`='$username'"; + $db_results = Dba::query($sql); + $row = Dba::fetch_assoc($db_results); $sql = "SELECT version()"; $db_results = Dba::query($sql); @@ -513,7 +517,6 @@ class vauth { } } // if prevent_multiple_logins - $results['type'] = 'mysql'; $results['success'] = true; diff --git a/lib/debug.lib.php b/lib/debug.lib.php index 6c6866ee..aac111b6 100644 --- a/lib/debug.lib.php +++ b/lib/debug.lib.php @@ -61,7 +61,7 @@ function check_database_inserted($dbh,$db_name) { } // Make sure the whole table is there - if (Dba::num_rows($db_results) != '6') { + if (Dba::num_rows($db_results) != '7') { return false; } @@ -119,9 +119,6 @@ if ($auth['success']) { $user->insert_ip_history(); } - // Reload the Preferences from the database - Preference::init(); - /* Make sure they are actually trying to get to this site and don't try to redirect them back into * an admin section **/ |