makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge r10503, r10504 into 3.0.7 branch.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10505 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2010-02-18 02:13:15 +00:00
parent dccd529498
commit 19da9ac065
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/install/database_update.php
View file

@ -907,8 +907,10 @@ function database_update_info()
), ),
), ),
// No changes from 3.0.7-RC1 to 3.0.7 // No changes from 3.0.7-RC1 to 3.0.7-RC2
'3.0.7-RC1' => array(), '3.0.7-RC1' => array(),
// No changes from 3.0.7-RC2 to 3.0.7
'3.0.7-RC2' => array(),
); );
} }
@ -1601,7 +1603,7 @@ function change_database_data(&$no_updates, $version)
$no_updates = false; $no_updates = false;
break; break;
// No changes from 3.0.7-RC1 to 3.0.7 // Changes from 3.0.7-RC1 to 3.0.7-RC2
case '3.0.7-RC1': case '3.0.7-RC1':
$sql = 'SELECT user_id, user_email, user_email_hash $sql = 'SELECT user_id, user_email, user_email_hash
@ -1624,13 +1626,19 @@ function change_database_data(&$no_updates, $version)
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . (int) $row['user_id']; WHERE user_id = ' . (int) $row['user_id'];
__sql($sql, $errored, $error_ary, ($i % 100 == 0)); _sql($sql, $errored, $error_ary, ($i % 100 == 0));
++$i; ++$i;
} }
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$no_updates = false;
break;
// No changes from 3.0.7-RC2 to 3.0.7
case '3.0.7-RC2':
break; break;
} }
} }