Merge branch 'develop-ascraeus' into develop

* develop-ascraeus: [ticket/12612] Prefix check_ids() with phpbb_ [ticket/12612] Prefix mcp_sorting() with phpbb_ [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global [ticket/12612] Prefix module url functions with phpbb_ [ticket/12612] Prefix upload_popup() with phpbb_ [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global [ticket/12612] Prefix custom UCP module function with phpbb_ [ticket/12612] Prefix _sort_last_active() with phpbb_ [ticket/12612] Prefix show_profile() with phpbb and delete unused global
2025-07-30 21:40:43 +02:00 · 2014-06-24 01:24:45 -04:00
parent 5bf8ac475b 41becd9c92
commit 10d963a94e
16 changed files with 109 additions and 97 deletions
--- a/phpBB/includes/mcp/mcp_ban.php
+++ b/phpBB/includes/mcp/mcp_ban.php
@@ -185,7 +185,7 @@ class mcp_ban
 		}
 		else if ($post_id)
 		{
-			$post_info = get_post_data($post_id, 'm_ban');
+			$post_info = phpbb_get_post_data($post_id, 'm_ban');

 			if (sizeof($post_info) && !empty($post_info[$post_id]))
 			{
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -102,7 +102,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sort_days = $total = 0;
 	$sort_key = $sort_dir = '';
 	$sort_by_sql = $sort_order_sql = array();
-	mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id);
+	phpbb_mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id);

 	$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
@@ -328,7 +328,7 @@ function mcp_resync_topics($topic_ids)
 		trigger_error('NO_TOPIC_SELECTED');
 	}

-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
 	{
 		return;
 	}
@@ -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]))
 	{
@@ -420,7 +420,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		return;
 	}

-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
+	if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
 	{
 		return;
 	}
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -187,7 +187,7 @@ class mcp_main

 				$forum_id = request_var('f', 0);

-				$forum_info = get_forum_data($forum_id, 'm_', true);
+				$forum_info = phpbb_get_forum_data($forum_id, 'm_', true);

 				if (!sizeof($forum_info))
 				{
@@ -252,7 +252,7 @@ function lock_unlock($action, $ids)

 	$orig_ids = $ids;

-	if (!check_ids($ids, $table, $sql_id, array('m_lock')))
+	if (!phpbb_check_ids($ids, $table, $sql_id, array('m_lock')))
 	{
 		// Make sure that for f_user_lock only the lock action is triggered.
 		if ($action != 'lock')
@@ -262,7 +262,7 @@ function lock_unlock($action, $ids)

 		$ids = $orig_ids;

-		if (!check_ids($ids, $table, $sql_id, array('f_user_lock')))
+		if (!phpbb_check_ids($ids, $table, $sql_id, array('f_user_lock')))
 		{
 			return;
 		}
@@ -286,7 +286,7 @@ function lock_unlock($action, $ids)
 			WHERE ' . $db->sql_in_set($sql_id, $ids);
 		$db->sql_query($sql);

-		$data = ($action == 'lock' || $action == 'unlock') ? get_topic_data($ids) : get_post_data($ids);
+		$data = ($action == 'lock' || $action == 'unlock') ? phpbb_get_topic_data($ids) : phpbb_get_post_data($ids);

 		foreach ($data as $id => $row)
 		{
@@ -346,7 +346,7 @@ function change_topic_type($action, $topic_ids)
 		break;
 	}

-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true);
+	$forum_id = phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true);

 	if ($forum_id === false)
 	{
@@ -388,7 +388,7 @@ function change_topic_type($action, $topic_ids)

 		if (sizeof($topic_ids))
 		{
-			$data = get_topic_data($topic_ids);
+			$data = phpbb_get_topic_data($topic_ids);

 			foreach ($data as $topic_id => $row)
 			{
@@ -422,7 +422,7 @@ function mcp_move_topic($topic_ids)
 	global $phpEx, $phpbb_root_path;

 	// Here we limit the operation to one forum only
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);
+	$forum_id = phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true);

 	if ($forum_id === false)
 	{
@@ -442,7 +442,7 @@ function mcp_move_topic($topic_ids)

 	if ($to_forum_id)
 	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
+		$forum_data = phpbb_get_forum_data($to_forum_id, 'f_post');

 		if (!sizeof($forum_data))
 		{
@@ -479,7 +479,7 @@ function mcp_move_topic($topic_ids)

 	if (confirm_box(true))
 	{
-		$topic_data = get_topic_data($topic_ids);
+		$topic_data = phpbb_get_topic_data($topic_ids);
 		$leave_shadow = (isset($_POST['move_leave_shadow'])) ? true : false;

 		$forum_sync_data = array();
@@ -677,7 +677,7 @@ function mcp_restore_topic($topic_ids)
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;

-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
 	{
 		return;
 	}
@@ -697,7 +697,7 @@ function mcp_restore_topic($topic_ids)
 	{
 		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_RESTORED_SUCCESS' : 'TOPICS_RESTORED_SUCCESS';

-		$data = get_topic_data($topic_ids);
+		$data = phpbb_get_topic_data($topic_ids);

 		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		foreach ($data as $topic_id => $row)
@@ -750,7 +750,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;

-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
 	{
 		return;
 	}
@@ -770,7 +770,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 	{
 		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_DELETED_SUCCESS' : 'TOPICS_DELETED_SUCCESS';

-		$data = get_topic_data($topic_ids);
+		$data = phpbb_get_topic_data($topic_ids);

 		foreach ($data as $topic_id => $row)
 		{
@@ -878,7 +878,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;

-	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
+	if (!phpbb_check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
 	{
 		return;
 	}
@@ -896,7 +896,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',

 	if (confirm_box(true) && $is_soft)
 	{
-		$post_info = get_post_data($post_ids);
+		$post_info = phpbb_get_post_data($post_ids);

 		$topic_info = $approve_log = array();

@@ -984,7 +984,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 		$affected_topics = sizeof($topic_id_list);
 		$db->sql_freeresult($result);

-		$post_data = get_post_data($post_ids);
+		$post_data = phpbb_get_post_data($post_ids);

 		foreach ($post_data as $id => $row)
 		{
@@ -1105,7 +1105,7 @@ function mcp_fork_topic($topic_ids)
 	global $auth, $user, $db, $template, $config;
 	global $phpEx, $phpbb_root_path;

-	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
+	if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_')))
 	{
 		return;
 	}
@@ -1124,7 +1124,7 @@ function mcp_fork_topic($topic_ids)

 	if ($to_forum_id)
 	{
-		$forum_data = get_forum_data($to_forum_id, 'f_post');
+		$forum_data = phpbb_get_forum_data($to_forum_id, 'f_post');

 		if (!sizeof($topic_ids))
 		{
@@ -1161,7 +1161,7 @@ function mcp_fork_topic($topic_ids)

 	if (confirm_box(true))
 	{
-		$topic_data = get_topic_data($topic_ids, 'f_post');
+		$topic_data = phpbb_get_topic_data($topic_ids, 'f_post');

 		$total_topics = $total_topics_unapproved = $total_topics_softdeleted = 0;
 		$total_posts = $total_posts_unapproved = $total_posts_softdeleted = 0;
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -100,7 +100,7 @@ class mcp_pm_reports
 				$pm_id = $report['pm_id'];
 				$report_id = $report['report_id'];

-				$pm_info = get_pm_data(array($pm_id));
+				$pm_info = phpbb_get_pm_data(array($pm_id));

 				if (!sizeof($pm_info))
 				{
@@ -216,7 +216,7 @@ class mcp_pm_reports
 				$sort_days = $total = 0;
 				$sort_key = $sort_dir = '';
 				$sort_by_sql = $sort_order_sql = array();
-				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total);
+				phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total);

 				$limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : '';

--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -33,7 +33,7 @@ function mcp_post_details($id, $mode, $action)
 	$start	= request_var('start', 0);

 	// Get post data
-	$post_info = get_post_data(array($post_id), false, true);
+	$post_info = phpbb_get_post_data(array($post_id), false, true);

 	add_form_key('mcp_post_details');

@@ -43,7 +43,7 @@ function mcp_post_details($id, $mode, $action)
 	}

 	$post_info = $post_info[$post_id];
-	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
+	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url());

 	switch ($action)
 	{
@@ -508,7 +508,7 @@ function change_poster(&$post_info, $userdata)
 	$to_username = $userdata['username'];

 	// Renew post info
-	$post_info = get_post_data(array($post_id), false, true);
+	$post_info = phpbb_get_post_data(array($post_id), false, true);

 	if (!sizeof($post_info))
 	{
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -159,7 +159,7 @@ class mcp_queue

 				if ($topic_id)
 				{
-					$topic_info = get_topic_data(array($topic_id), 'm_approve');
+					$topic_info = phpbb_get_topic_data(array($topic_id), 'm_approve');
 					if (isset($topic_info[$topic_id]['topic_first_post_id']))
 					{
 						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
@@ -174,7 +174,7 @@ class mcp_queue

 				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);

-				$post_info = get_post_data(array($post_id), 'm_approve', true);
+				$post_info = phpbb_get_post_data(array($post_id), 'm_approve', true);

 				if (!sizeof($post_info))
 				{
@@ -343,7 +343,7 @@ class mcp_queue

 				if ($topic_id)
 				{
-					$topic_info = get_topic_data(array($topic_id));
+					$topic_info = phpbb_get_topic_data(array($topic_id));

 					if (!sizeof($topic_info))
 					{
@@ -389,7 +389,7 @@ class mcp_queue
 				}
 				else
 				{
-					$forum_info = get_forum_data(array($forum_id), $m_perm);
+					$forum_info = phpbb_get_forum_data(array($forum_id), $m_perm);

 					if (!sizeof($forum_info))
 					{
@@ -409,7 +409,7 @@ class mcp_queue
 				$sort_days = $total = 0;
 				$sort_key = $sort_dir = '';
 				$sort_by_sql = $sort_order_sql = array();
-				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
+				phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);

 				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
@@ -572,7 +572,7 @@ class mcp_queue
 		global $db, $template, $user, $config, $request, $phpbb_container;
 		global $phpEx, $phpbb_root_path;

-		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+		if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 		{
 			trigger_error('NOT_AUTHORISED');
 		}
@@ -591,7 +591,7 @@ class mcp_queue
 			'redirect'		=> $redirect,
 		));

-		$post_info = get_post_data($post_id_list, 'm_approve');
+		$post_info = phpbb_get_post_data($post_id_list, 'm_approve');

 		if (confirm_box(true))
 		{
@@ -795,7 +795,7 @@ class mcp_queue
 		global $db, $template, $user, $config;
 		global $phpEx, $phpbb_root_path, $request, $phpbb_container;

-		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
+		if (!phpbb_check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
 		{
 			trigger_error('NOT_AUTHORISED');
 		}
@@ -813,7 +813,7 @@ class mcp_queue
 			'redirect'		=> $redirect,
 		));

-		$topic_info = get_topic_data($topic_id_list, 'm_approve');
+		$topic_info = phpbb_get_topic_data($topic_id_list, 'm_approve');

 		if (confirm_box(true))
 		{
@@ -964,7 +964,7 @@ class mcp_queue
 		global $db, $template, $user, $config, $phpbb_container;
 		global $phpEx, $phpbb_root_path, $request;

-		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+		if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 		{
 			trigger_error('NOT_AUTHORISED');
 		}
@@ -1016,7 +1016,7 @@ class mcp_queue
 			}
 		}

-		$post_info = get_post_data($post_id_list, 'm_approve');
+		$post_info = phpbb_get_post_data($post_id_list, 'm_approve');

 		$is_disapproving = false;
 		foreach ($post_info as $post_id => $post_data)
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -106,7 +106,7 @@ class mcp_reports
 				$parse_post_flags += $report['reported_post_enable_smilies'] ? OPTION_FLAG_SMILIES : 0;
 				$parse_post_flags += $report['reported_post_enable_magic_url'] ? OPTION_FLAG_LINKS : 0;

-				$post_info = get_post_data(array($post_id), 'm_report', true);
+				$post_info = phpbb_get_post_data(array($post_id), 'm_report', true);

 				if (!sizeof($post_info))
 				{
@@ -269,7 +269,7 @@ class mcp_reports

 				if ($topic_id)
 				{
-					$topic_info = get_topic_data(array($topic_id));
+					$topic_info = phpbb_get_topic_data(array($topic_id));

 					if (!sizeof($topic_info))
 					{
@@ -312,7 +312,7 @@ class mcp_reports
 				}
 				else
 				{
-					$forum_info = get_forum_data(array($forum_id), 'm_report');
+					$forum_info = phpbb_get_forum_data(array($forum_id), 'm_report');

 					if (!sizeof($forum_info))
 					{
@@ -338,7 +338,7 @@ class mcp_reports
 				$sort_days = $total = 0;
 				$sort_key = $sort_dir = '';
 				$sort_by_sql = $sort_order_sql = array();
-				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
+				phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);

 				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : '';
@@ -479,7 +479,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 	}
 	else
 	{
-		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_report')))
+		if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_report')))
 		{
 			trigger_error('NOT_AUTHORISED');
 		}
@@ -515,7 +515,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)

 	if (confirm_box(true))
 	{
-		$post_info = ($pm) ? get_pm_data($post_id_list) : get_post_data($post_id_list, 'm_report');
+		$post_info = ($pm) ? phpbb_get_pm_data($post_id_list) : phpbb_get_post_data($post_id_list, 'm_report');

 		$sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type
 			FROM " . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -27,13 +27,13 @@ function mcp_topic_view($id, $mode, $action)
 	global $phpEx, $phpbb_root_path, $config;
 	global $template, $db, $user, $auth, $cache, $phpbb_container;

-	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
+	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url());

 	$user->add_lang('viewtopic');
 	$pagination = $phpbb_container->get('pagination');

 	$topic_id = request_var('t', 0);
-	$topic_info = get_topic_data(array($topic_id), false, true);
+	$topic_info = phpbb_get_topic_data(array($topic_id), false, true);

 	if (!sizeof($topic_info))
 	{
@@ -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');
@@ -278,7 +278,7 @@ function mcp_topic_view($id, $mode, $action)
 		// Has the user selected a topic for merge?
 		if ($to_topic_id)
 		{
-			$to_topic_info = get_topic_data(array($to_topic_id), 'm_merge');
+			$to_topic_info = phpbb_get_topic_data(array($to_topic_id), 'm_merge');

 			if (!sizeof($to_topic_info))
 			{
@@ -368,13 +368,13 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 		return;
 	}

-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_split')))
+	if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_split')))
 	{
 		return;
 	}

 	$post_id = $post_id_list[0];
-	$post_info = get_post_data(array($post_id));
+	$post_info = phpbb_get_post_data(array($post_id));

 	if (!sizeof($post_info))
 	{
@@ -398,7 +398,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 		return;
 	}

-	$forum_info = get_forum_data(array($to_forum_id), 'f_post');
+	$forum_info = phpbb_get_forum_data(array($to_forum_id), 'f_post');

 	if (!sizeof($forum_info))
 	{
@@ -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)) : '';

@@ -505,7 +505,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 		$to_topic_id = $db->sql_nextid();
 		move_posts($post_id_list, $to_topic_id);

-		$topic_info = get_topic_data(array($topic_id));
+		$topic_info = phpbb_get_topic_data(array($topic_id));
 		$topic_info = $topic_info[$topic_id];

 		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_SPLIT_DESTINATION', $subject);
@@ -594,7 +594,7 @@ function merge_posts($topic_id, $to_topic_id)

 	$sync_topics = array($topic_id, $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]))
 	{
@@ -619,7 +619,7 @@ function merge_posts($topic_id, $to_topic_id)
 		return;
 	}

-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
+	if (!phpbb_check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge')))
 	{
 		return;
 	}