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

[ticket/14616] Switch prune limit to sql_query_limit instead of sql_and

Browse source 
PHPBB3-14616
This commit is contained in:
Max Krivanek 2016-07-06 23:00:35 -05:00
parent c4b93c9c1c
commit 1c52968df6
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/functions_admin.php
View file

@ -2573,11 +2573,6 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
$sql_and .= ' AND topic_status = ' . ITEM_MOVED . " AND topic_last_post_time < $prune_date"; $sql_and .= ' AND topic_status = ' . ITEM_MOVED . " AND topic_last_post_time < $prune_date";
} }
if ($prune_limit > 0)
{
$sql_and .= " LIMIT $prune_limit";
}
/** /**
* Use this event to modify the SQL that selects topics to be pruned * Use this event to modify the SQL that selects topics to be pruned
* *
@ -2608,7 +2603,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " WHERE ' . $db->sql_in_set('forum_id', $forum_id) . "
AND poll_start = 0 AND poll_start = 0
$sql_and"; $sql_and";
$result = $db->sql_query($sql); $result = $db->sql_query_limit($sql, $prune_limit);
$topic_list = array(); $topic_list = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -2625,7 +2620,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
AND poll_start > 0 AND poll_start > 0
AND poll_last_vote < $prune_date AND poll_last_vote < $prune_date
$sql_and"; $sql_and";
$result = $db->sql_query($sql); $result = $db->sql_query_limit($sql, $prune_limit);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {