aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_topic.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-23 23:00:13 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-23 23:00:13 +0200
commit4ac43856f7adad2ed60d82995454f847aaca1842 (patch)
tree553d396e83b40c27a6b0388ba79644cb0fe3e382 /phpBB/includes/mcp/mcp_topic.php
parentc315fc6c891fbeceb20a7370b293cea4645d0193 (diff)
downloadforums-4ac43856f7adad2ed60d82995454f847aaca1842.tar
forums-4ac43856f7adad2ed60d82995454f847aaca1842.tar.gz
forums-4ac43856f7adad2ed60d82995454f847aaca1842.tar.bz2
forums-4ac43856f7adad2ed60d82995454f847aaca1842.tar.xz
forums-4ac43856f7adad2ed60d82995454f847aaca1842.zip
[ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
-rw-r--r--phpBB/includes/mcp/mcp_topic.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 3ff7bedf85..1be11de7f5 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -114,7 +114,7 @@ function mcp_topic_view($id, $mode, $action)
$sort_days = $total = 0;
$sort_key = $sort_dir = '';
$sort_by_sql = $sort_order_sql = array();
- mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql);
+ phpbb_mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql);
$limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
$phpbb_content_visibility = $phpbb_container->get('content.visibility');
@@ -438,7 +438,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
$sort_days = $total = 0;
$sort_key = $sort_dir = '';
$sort_by_sql = $sort_order_sql = array();
- mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
+ phpbb_mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';