From 61d8bf79c169e601b480bf54fc393c453b8874a0 Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 22 Nov 2008 23:33:17 +0000 Subject: - Bug fixed: username or password with accented character are now accepted for upgrade. - Simplify query in pwg_session_write function. - Retrieve data with cURL method in fetchRemote function now work with forwarded URL. git-svn-id: http://piwigo.org/svn/trunk@2900 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_upgrade.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'admin/include/functions_upgrade.php') diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 65b0a21ed..01ffb75b8 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -141,7 +141,13 @@ function check_upgrade_access_rights($current_release, $username, $password) $username = mysql_real_escape_string($username); } - if (version_compare($current_release, '1.5.0', '<')) + if (version_compare($current_release, '2.0', '<')) + { + $username = utf8_decode($username); + $password = utf8_decode($password); + } + + if (version_compare($current_release, '1.5', '<')) { $query = ' SELECT password, status @@ -166,7 +172,7 @@ WHERE '.$conf['user_fields']['username'].'="'.$username.'" $conf['pass_convert'] = create_function('$s', 'return md5($s);'); } - if ($row['password'] != $conf['pass_convert']($_POST['password'])) + if ($row['password'] != $conf['pass_convert']($password)) { array_push($page['errors'], l10n('invalid_pwd')); } -- cgit v1.2.3