aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_forum.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-23 22:58:41 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-23 22:58:41 +0200
commitc315fc6c891fbeceb20a7370b293cea4645d0193 (patch)
treeeaf1d620251f86b6b321694d46bac4966d353f5a /phpBB/includes/mcp/mcp_forum.php
parentbba23f61b334a32faf8c33b62266ae55fa4616a5 (diff)
downloadforums-c315fc6c891fbeceb20a7370b293cea4645d0193.tar
forums-c315fc6c891fbeceb20a7370b293cea4645d0193.tar.gz
forums-c315fc6c891fbeceb20a7370b293cea4645d0193.tar.bz2
forums-c315fc6c891fbeceb20a7370b293cea4645d0193.tar.xz
forums-c315fc6c891fbeceb20a7370b293cea4645d0193.zip
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
-rw-r--r--phpBB/includes/mcp/mcp_forum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index e63888e70e..5b3305d8bb 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -380,7 +380,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
$sync_topics = array_merge($topic_ids, array($to_topic_id));
- $topic_data = get_topic_data($sync_topics, 'm_merge');
+ $topic_data = phpbb_get_topic_data($sync_topics, 'm_merge');
if (!sizeof($topic_data) || empty($topic_data[$to_topic_id]))
{