Changeset 2839 for branches/2.0/admin

Timestamp:

Nov 7, 2008, 2:56:00 PM (15 years ago)

Author:

patdenice

Message:

merge -c2838 from trunk to branch 2.0

• improve 1.3.1 upgrade (automatic write in mysql.inc.php).
• translate 1.3.1 upgrade informations messages.
• security fix in upgrade login.

File:

• branches/2.0/admin/include/functions_upgrade.php (modified) (2 diffs)

branches/2.0/admin/include/functions_upgrade.php

@@ -137 +137 @@
   global $conf, $page;
 
+  if(!get_magic_quotes_gpc())
+  {
+    $username = mysql_real_escape_string($username);
+  }
+
   if (version_compare($current_release, '1.5.0', '<'))
   {
     $query = '
 SELECT password, status
-FROM '.PREFIX_TABLE.'users
+FROM '.USERS_TABLE.'
 WHERE username = "'.$username.'"
 ;';
@@ -150 +155 @@
 SELECT u.password, ui.status
 FROM '.$conf['users_table'].' AS u
-INNER JOIN '.PREFIX_TABLE.'user_infos AS ui
-ON u.id = ui.user_id
+INNER JOIN '.USER_INFOS_TABLE.' AS ui
+ON u.'.$conf['user_fields']['id'].'=ui.user_id
 WHERE '.$conf['user_fields']['username'].'="'.$username.'"
 ;';