From a25238e0c16ba238136475bb1dcc17472fedfffa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 24 Feb 2011 23:51:42 +0100
Subject: [ticket/9874] view_log() performs unneeded count query over all log
 entries.

PHPBB3-9874
---
 phpBB/includes/mcp/mcp_front.php | 2 +-
 phpBB/includes/mcp/mcp_post.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 50e14b9336..af262baa29 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -350,7 +350,7 @@ function mcp_front_view($id, $mode, $action)
 			// Add forum_id 0 for global announcements
 			$forum_list[] = 0;
 
-			$log_count = 0;
+			$log_count = false;
 			$log = array();
 			view_log('mod', $log, $log_count, 5, 0, $forum_list);
 
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 7098b4bbce..de7f3e63ee 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -227,10 +227,10 @@ function mcp_post_details($id, $mode, $action)
 
 	// Get User Notes
 	$log_data = array();
-	$log_count = 0;
+	$log_count = false;
 	view_log('user', $log_data, $log_count, $config['posts_per_page'], 0, 0, 0, $post_info['user_id']);
 
-	if ($log_count)
+	if (!empty($log_data))
 	{
 		$template->assign_var('S_USER_NOTES', true);
 
-- 
cgit v1.2.1


From a72fe8acafa85b5a65a40c7661487d8cee7776f5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Apr 2011 14:53:47 +0200
Subject: [ticket/10109] Fix "Undefined Index" errors when copying a topic.

PHPBB3-10109
---
 phpBB/includes/mcp/mcp_main.php | 51 +++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index d5551f5114..ad10a52705 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1048,37 +1048,38 @@ function mcp_fork_topic($topic_ids)
 		$total_posts = 0;
 		$new_topic_id_list = array();
 
-		if ($topic_data['enable_indexing'])
-		{
-			// Select the search method and do some additional checks to ensure it can actually be utilised
-			$search_type = basename($config['search_type']);
 
-			if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+		foreach ($topic_data as $topic_id => $topic_row)
+		{
+			if (!isset($search_type) && $topic_row['enable_indexing'])
 			{
-				trigger_error('NO_SUCH_SEARCH_MODULE');
-			}
+				// Select the search method and do some additional checks to ensure it can actually be utilised
+				$search_type = basename($config['search_type']);
 
-			if (!class_exists($search_type))
-			{
-				include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
-			}
+				if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+				{
+					trigger_error('NO_SUCH_SEARCH_MODULE');
+				}
+
+				if (!class_exists($search_type))
+				{
+					include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
+				}
 
-			$error = false;
-			$search = new $search_type($error);
-			$search_mode = 'post';
+				$error = false;
+				$search = new $search_type($error);
+				$search_mode = 'post';
 
-			if ($error)
+				if ($error)
+				{
+					trigger_error($error);
+				}
+			}
+			else if (!isset($search_type) && !$topic_row['enable_indexing'])
 			{
-				trigger_error($error);
+				$search_type = false;
 			}
-		}
-		else
-		{
-			$search_type = false;
-		}
 
-		foreach ($topic_data as $topic_id => $topic_row)
-		{
 			$sql_ary = array(
 				'forum_id'					=> (int) $to_forum_id,
 				'icon_id'					=> (int) $topic_row['icon_id'],
@@ -1187,9 +1188,9 @@ function mcp_fork_topic($topic_ids)
 				// Copy whether the topic is dotted
 				markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']);
 
-				if ($search_type)
+				if (!empty($search_type))
 				{
-					$search->index($search_mode, $sql_ary['post_id'], $sql_ary['post_text'], $sql_ary['post_subject'], $sql_ary['poster_id'], ($topic_row['topic_type'] == POST_GLOBAL) ? 0 : $to_forum_id);
+					$search->index($search_mode, $new_post_id, $sql_ary['post_text'], $sql_ary['post_subject'], $sql_ary['poster_id'], ($topic_row['topic_type'] == POST_GLOBAL) ? 0 : $to_forum_id);
 					$search_mode = 'reply'; // After one we index replies
 				}
 
-- 
cgit v1.2.1