mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

[ticket/11162] Review comments fixed.

Browse Source 
PHPBB3-11162
This commit is contained in:
Oleg Pudeyev 2012-12-05 10:44:36 -05:00
parent 16966f52d3
commit fe87d441ee
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions_tricky_update.php
View File

@ -39,19 +39,19 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
$old_user_ids = array(); $old_user_ids = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$old_user_ids[$row[$column]][] = $row['user_id']; $old_user_ids[$row[$column]][] = (int) $row['user_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql = "SELECT $column, user_id $sql = "SELECT $column, user_id
FROM $table FROM $table
WHERE $column = '" . (int) $to_value . "'"; WHERE $column = " . (int) $to_value;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$new_user_ids = array(); $new_user_ids = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$new_user_ids[$row[$column]][] = $row['user_id']; $new_user_ids[$row[$column]][] = (int) $row['user_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -126,19 +126,19 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
$old_user_ids = array(); $old_user_ids = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$old_user_ids[(int) $row['notify_status']][$row[$column]][] = $row['user_id']; $old_user_ids[(int) $row['notify_status']][$row[$column]][] = (int) $row['user_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql = "SELECT $column, user_id $sql = "SELECT $column, user_id
FROM $table FROM $table
WHERE $column = '" . (int) $to_value . "'"; WHERE $column = " . (int) $to_value;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$new_user_ids = array(); $new_user_ids = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$new_user_ids[$row[$column]][] = $row['user_id']; $new_user_ids[$row[$column]][] = (int) $row['user_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

3
tests/functions_tricky_update/update_rows_avoiding_duplicates_notify_status_test.php
View File

@ -90,7 +90,8 @@ class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_dat
// user id of 1 is the user being updated // user id of 1 is the user being updated
$sql = 'SELECT notify_status $sql = 'SELECT notify_status
FROM ' . TOPICS_WATCH_TABLE . ' FROM ' . TOPICS_WATCH_TABLE . '
WHERE topic_id = ' . (int) $to . ' AND user_id = 1'; WHERE topic_id = ' . (int) $to . '
AND user_id = 1';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$notify_status = $db->sql_fetchfield('notify_status'); $notify_status = $db->sql_fetchfield('notify_status');
$db->sql_freeresult($result); $db->sql_freeresult($result);