From 6a75edc057270f081c4eb85763771e689770d510 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 8 Oct 2013 11:17:02 -0700
Subject: [ticket/11892] Fix undefined variables: to_forum_id & to_topic_id

PHPBB3-11892
---
 phpBB/includes/mcp/mcp_forum.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes/mcp/mcp_forum.php')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 6df3320a97..d0d13aaf13 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -450,22 +450,14 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
-	}
-	else
-	{
-		confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields);
-	}
-
-	$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
-	$redirect = reapply_sid($redirect);
+		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
+		$redirect = reapply_sid($redirect);
 
-	if (!$success_msg)
-	{
-		return;
+		meta_refresh(3, $redirect);
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
 	}
 	else
 	{
-		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+		confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields);
 	}
 }
-- 
cgit v1.2.1


From cb8b2bab5f72023ad2de95bcb59f90e7121e6369 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Dec 2013 18:27:17 +0100
Subject: [ticket/11849] Fix more function calls

PHPBB3-11849
---
 phpBB/includes/mcp/mcp_forum.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/mcp/mcp_forum.php')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index d0d13aaf13..a3b2184d48 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -73,6 +73,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		break;
 	}
 
+	$pagination = $phpbb_container->get('pagination');
+
 	$selected_ids = '';
 	if (sizeof($post_id_list) && $action != 'merge_topics')
 	{
@@ -102,7 +104,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 	$base_url = $url . "&amp;i=$id&amp;action=$action&amp;mode=$mode&amp;sd=$sort_dir&amp;sk=$sort_key&amp;st=$sort_days" . (($merge_select) ? $selected_ids : '');
-	phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $forum_topics, $topics_per_page, $start);
+	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $forum_topics, $topics_per_page, $start);
 
 	$template->assign_vars(array(
 		'ACTION'				=> $action,
@@ -133,7 +135,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		'S_MCP_ACTION'			=> $url . "&amp;i=$id&amp;forum_action=$action&amp;mode=$mode&amp;start=$start" . (($merge_select) ? $selected_ids : ''),
 
-		'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $forum_topics, $topics_per_page, $start),
+		'PAGE_NUMBER'			=> $pagination->on_page($base_url, $forum_topics, $topics_per_page, $start),
 		'TOTAL_TOPICS'			=> $user->lang('VIEW_FORUM_TOPICS', (int) $forum_topics),
 	));
 
-- 
cgit v1.2.1