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

[ticket/11162] Use empty($queries).

Browse source 
PHPBB3-11162
This commit is contained in:
Oleg Pudeyev 2012-12-05 10:47:26 -05:00
parent fe87d441ee
commit f5de11438c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_tricky_update.php
View file

@ -56,14 +56,12 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
$db->sql_freeresult($result); $db->sql_freeresult($result);
$queries = array(); $queries = array();
$any_found = false;
foreach ($from_values as $from_value) foreach ($from_values as $from_value)
{ {
if (!isset($old_user_ids[$from_value])) if (!isset($old_user_ids[$from_value]))
{ {
continue; continue;
} }
$any_found = true;
if (empty($new_user_ids)) if (empty($new_user_ids))
{ {
$sql = "UPDATE $table $sql = "UPDATE $table
@ -85,7 +83,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
} }
} }
if ($any_found) if (!empty($queries))
{ {
$db->sql_transaction('begin'); $db->sql_transaction('begin');
@ -143,7 +141,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
$db->sql_freeresult($result); $db->sql_freeresult($result);
$queries = array(); $queries = array();
$any_found = false;
$extra_updates = array( $extra_updates = array(
0 => 'notify_status = 0', 0 => 'notify_status = 0',
1 => '', 1 => '',
@ -156,7 +153,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
{ {
continue; continue;
} }
$any_found = true;
if (empty($new_user_ids)) if (empty($new_user_ids))
{ {
$sql = "UPDATE $table $sql = "UPDATE $table
@ -192,7 +188,7 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
} }
} }
if ($any_found) if (!empty($queries))
{ {
$db->sql_transaction('begin'); $db->sql_transaction('begin');