diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 10:47:26 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 10:47:26 -0500 |
| commit | f5de11438c471a76fc5c5f3a4b8c4c29d07ed734 (patch) | |
| tree | 665c0c0c01e0c96d3a109eede97f4be09ba630a6 /phpBB/includes/functions_tricky_update.php | |
| parent | fe87d441eeb54bf5efb56a0f69f42848d9ef53d5 (diff) | |
| download | forums-f5de11438c471a76fc5c5f3a4b8c4c29d07ed734.tar forums-f5de11438c471a76fc5c5f3a4b8c4c29d07ed734.tar.gz forums-f5de11438c471a76fc5c5f3a4b8c4c29d07ed734.tar.bz2 forums-f5de11438c471a76fc5c5f3a4b8c4c29d07ed734.tar.xz forums-f5de11438c471a76fc5c5f3a4b8c4c29d07ed734.zip | |
[ticket/11162] Use empty($queries).
PHPBB3-11162
Diffstat (limited to 'phpBB/includes/functions_tricky_update.php')
| -rw-r--r-- | phpBB/includes/functions_tricky_update.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php index 05cb65e68d..664c246888 100644 --- a/phpBB/includes/functions_tricky_update.php +++ b/phpBB/includes/functions_tricky_update.php @@ -56,14 +56,12 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value $db->sql_freeresult($result); $queries = array(); - $any_found = false; foreach ($from_values as $from_value) { if (!isset($old_user_ids[$from_value])) { continue; } - $any_found = true; if (empty($new_user_ids)) { $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'); @@ -143,7 +141,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum $db->sql_freeresult($result); $queries = array(); - $any_found = false; $extra_updates = array( 0 => 'notify_status = 0', 1 => '', @@ -156,7 +153,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum { continue; } - $any_found = true; if (empty($new_user_ids)) { $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'); |
