diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-17 05:18:37 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-17 05:18:37 +0000 |
| commit | 603227a02fb0ca3de361afcc44a52820b6405a7b (patch) | |
| tree | 1b1427c65fdf81c8becdea0dd0f110e09549e3e0 /phpBB/includes/functions_admin.php | |
| parent | 9300c4090078949ccb314a4dab4f5f3d300fade8 (diff) | |
| download | forums-603227a02fb0ca3de361afcc44a52820b6405a7b.tar forums-603227a02fb0ca3de361afcc44a52820b6405a7b.tar.gz forums-603227a02fb0ca3de361afcc44a52820b6405a7b.tar.bz2 forums-603227a02fb0ca3de361afcc44a52820b6405a7b.tar.xz forums-603227a02fb0ca3de361afcc44a52820b6405a7b.zip | |
#7840
git-svn-id: file:///svn/phpbb/trunk@7000 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index f319873e2c..a3e5a2c685 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -502,13 +502,21 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s $approved_topics = 0; $forum_ids = $topic_ids = array(); - if (is_array($where_ids)) + if ($where_type === 'range') { - $where_ids = array_unique($where_ids); + $where_clause = $where_ids; } else { - $where_ids = array($where_ids); + if (is_array($where_ids)) + { + $where_ids = array_unique($where_ids); + } + else + { + $where_ids = array($where_ids); + } + $where_clause = $db->sql_in_set($where_type, $where_ids); } if (!sizeof($where_ids)) @@ -522,7 +530,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s $sql = 'SELECT topic_id, forum_id, topic_approved FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set($where_type, $where_ids); + WHERE ' . ; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -583,18 +591,27 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = { global $db, $config, $phpbb_root_path, $phpEx; - if (is_array($where_ids)) + if ($where_type === 'range') { - $where_ids = array_unique($where_ids); + $where_clause = $where_ids; } else { - $where_ids = array($where_ids); - } + if (is_array($where_ids)) + { + $where_ids = array_unique($where_ids); + } + else + { + $where_ids = array($where_ids); + } - if (!sizeof($where_ids)) - { - return false; + if (!sizeof($where_ids)) + { + return false; + } + + $where_clause = $db->sql_in_set($where_type, array_map('intval', $where_ids); } $approved_posts = 0; @@ -602,7 +619,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = $sql = 'SELECT post_id, poster_id, post_approved, post_postcount, topic_id, forum_id FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set($where_type, array_map('intval', $where_ids)); + WHERE ' . $where_clause); $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) |