2 files changed, 18 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index f858da6a16..342ec34e29 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -17,7 +17,7 @@ class acp_search
 	var $state;
 	var $search;
 	var $max_post_id;
-	var $batch_size = 4000;
+	var $batch_size = 5000;
 
 	function main($id, $mode)
 	{
@@ -320,6 +320,16 @@ class acp_search
 				}
 				else
 				{
+					$sql = 'SELECT forum_id, enable_indexing
+						FROM ' . FORUMS_TABLE;
+					$result = $db->sql_query($sql, 3600);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$forums[$row['forum_id']] = (bool) $row['enable_indexing'];
+					}
+					$db->sql_freeresult($result);
+
 					$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
 						FROM ' . POSTS_TABLE . '
 						WHERE post_id >= ' . (int) ($post_counter + 1) . '
@@ -328,7 +338,10 @@ class acp_search
 
 					while ($row = $db->sql_fetchrow($result))
 					{
-						$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
+						if ($forums[$row['forum_id']])
+						{
+							$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
+						}
 					}
 					$db->sql_freeresult($result);
 
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index a1937b592f..34dbd4c7ff 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1121,7 +1121,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 							$s_units = '<option value=""' . (($unit == '') ? ' selected="selected"' : '') . '>' . $user->lang['NO_UNIT'] . '</option>' . $s_units;
 
 							$template->assign_vars(array(
-								strtoupper($var) => $value,
+								strtoupper($var) => htmlspecialchars($value),
 								'S_' . strtoupper($var) . '_UNITS' => $s_units)
 							);
 						break;
@@ -1162,7 +1162,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 
 						default:
 							$template->assign_vars(array(
-								strtoupper($var) => $value)
+								strtoupper($var) => htmlspecialchars($value))
 							);
 					}
 				}
@@ -1226,7 +1226,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 						break;
 
 						default:
-							$value = request_var($var, '');
+							$value = htmlspecialchars_decode(request_var($var, ''));
 					}
 
 					// use the element mapping to create raw css code