3 files changed, 41 insertions, 45 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 73f57d16f5..8de3fac2b3 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -24,6 +24,7 @@ class bbcode
 	var $bbcode_uid = '';
 	var $bbcode_bitfield = 0;
 	var $bbcode_cache = array();
+	var $bbcode_tpl = array();
 
 	function bbcode($bitfield = 0)
 	{
diff --git a/phpBB/posting.php b/phpBB/posting.php
index cf52fdb822..cd041fc62c 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1134,9 +1134,22 @@ page_footer();
 // Topic Review
 function topic_review($topic_id, $is_inline_review = false)
 {
+	global $template;
+
+	if ($is_inline_review)
+	{
+		$template->assign_vars(array(
+			'S_DISPLAY_INLINE'	=> true)
+		);
+
+		return;
+	}
+
 	global $user, $auth, $db, $template, $bbcode;
 	global $censors, $config, $phpbb_root_path, $phpEx, $SID;
 
+	$user->setup();
+	
 	// Define censored word matches
 	if (empty($censors))
 	{
@@ -1144,40 +1157,33 @@ function topic_review($topic_id, $is_inline_review = false)
 		obtain_word_list($censors);
 	}
 
-	if (!$is_inline_review)
-	{
-		// Get topic info ...
-		$sql = "SELECT t.topic_title, f.forum_id
-			FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
-			WHERE t.topic_id = $topic_id
-				AND f.forum_id = t.forum_id";
-		$result = $db->sql_query($sql);
-
-		if (!($row = $db->sql_fetchrow($result)))
-		{
-			trigger_error($user->lang['NO_TOPIC']);
-		}
+	// Get topic info ...
+	$sql = "SELECT t.topic_title, f.forum_id
+		FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
+		WHERE t.topic_id = $topic_id
+			AND f.forum_id = t.forum_id";
+	$result = $db->sql_query($sql);
 
-		$forum_id = intval($row['forum_id']);
-		$topic_title = $row['topic_title'];
+	if (!($row = $db->sql_fetchrow($result)))
+	{
+		trigger_error($user->lang['NO_TOPIC']);
+	}
 
-		if (!$auth->acl_get('f_read', $forum_id))
-		{
-			trigger_error($user->lang['SORRY_AUTH_READ']);
-		}
+	$forum_id = intval($row['forum_id']);
+	$topic_title = $row['topic_title'];
 
-		if (count($censors['match']))
-		{
-			$topic_title = preg_replace($censors['match'], $censors['replace'], $topic_title);
-		}
+	if (!$auth->acl_get('f_read', $forum_id))
+	{
+		trigger_error($user->lang['SORRY_AUTH_READ']);
 	}
-	else
+
+	if (count($censors['match']))
 	{
-		$template->assign_vars(array(
-			'S_DISPLAY_INLINE'	=> true)
-		);
+		$topic_title = preg_replace($censors['match'], $censors['replace'], $topic_title);
 	}
 
+	$page_title = $user->lang['TOPIC_REVIEW'] . ' - ' . $topic_title;
+
 	if (!isset($bbcode))
 	{
 		include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
@@ -1242,24 +1248,13 @@ function topic_review($topic_id, $is_inline_review = false)
 	}
 	$db->sql_freeresult($result);
 
-	$template->assign_vars(array(
-		'L_MESSAGE' 	=> $user->lang['MESSAGE'],
-		'L_POSTED' 		=> $user->lang['POSTED'],
-		'L_POST_SUBJECT'=> $user->lang['POST_SUBJECT'],
-		'L_TOPIC_REVIEW'=> $user->lang['TOPIC_REVIEW'])
-	);
-
-	if (!$is_inline_review)
-	{
-		$page_title = $user->lang['TOPIC_REVIEW'] . ' - ' . $topic_title;
-		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+	page_header($page_title);
 
-		$template->set_filenames(array(
-			'body' => 'posting_topic_review.html')
-		);
+	$template->set_filenames(array(
+		'body' => 'posting_topic_review.html')
+	);
 
-		page_footer();
-	}
+	page_footer();
 }
 
 // Temp Function - strtolower (will have a look at iconv later) - borrowed from php.net
diff --git a/phpBB/templates/subSilver/posting_topic_review.html b/phpBB/templates/subSilver/posting_topic_review.html
index 8d0ddc6684..1ffbf5d7dc 100644
--- a/phpBB/templates/subSilver/posting_topic_review.html
+++ b/phpBB/templates/subSilver/posting_topic_review.html
@@ -11,8 +11,6 @@
 
 <!-- INCLUDE simple_header.html -->
 
-<!-- ENDIF -->
-
 <table class="tablebg" width="100%" cellpadding="2" cellspacing="1" border="0">
 	<tr>
 		<th width="22%" height="26">{L_AUTHOR}</th>
@@ -43,6 +41,8 @@
 	 <!-- END postrow -->
 </table>
 
+<!-- ENDIF -->
+
 <!-- IF S_DISPLAY_INLINE -->
 		</iframe></td>
 	</tr>