diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c28c2df30a..966b253466 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -174,7 +174,7 @@ function get_forum_parents($forum_data)
 // Obtain list of moderators of each forum
 function get_moderators(&$forum_moderators, $forum_id = false)
 {
-	global $config, $template, $db;
+	global $config, $template, $db, $phpEx, $SID;
 
 	// Have we disabled the display of moderators? If so, then return
 	// from whence we came ... 
@@ -618,9 +618,9 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
 				SET $type_update forum_id = $forum_id, mark_time = " . time() . "
 				WHERE topic_id = $topic_id
 					AND user_id = " . $user->data['user_id'];
-			$db->sql_query($sql);
+			$result = $db->sql_query($sql);
 
-			if ($db->sql_affectedrows($result) == 0)
+			if (!$db->sql_affectedrows($result))
 			{
 				// Couldn't update. Row probably doesn't exist. Insert one.
 				if(isset($type) && $type = 1)
@@ -908,10 +908,10 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	switch ($errno)
 	{
 		case E_WARNING:
-//			if (defined('DEBUG'))
-//			{
-//				echo "PHP Warning on line <b>$errline</b> in <b>$errfile</b> :: <b>$msg_text</b>";
-//			}
+			if (defined('DEBUG_EXTRA'))
+			{
+//				echo "PHP Warning on line <b>$errline</b> in <b>$errfile</b> :: <b>$msg_text</b><br />";
+			}
 			break;
 
 		case E_NOTICE:
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c1a8baff73..6fa6a7375c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -21,7 +21,8 @@
 
 function display_forums($root_data = '', $display_moderators = TRUE)
 {
-	global $db, $template, $auth, $user, $phpEx, $SID, $forum_moderators;
+	global $db, $template, $auth, $user;
+	global $config, $phpEx, $SID, $forum_moderators;
 
 	$visible_forums = 0;
 
@@ -48,7 +49,7 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 	else
 	{
 		$lastread_select = '';
-		$lastread_sql = '';
+		$sql_lastread = '';
 
 		// Cookie based tracking
 	}
@@ -238,7 +239,7 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 		}
 		else
 		{
-			$last_post = $user->lang['NO_POSTS'];
+			$last_post_time = $last_poster = $last_poster_url = $last_post_url = '';
 		}
 
 		//
@@ -262,7 +263,6 @@ function display_forums($root_data = '', $display_moderators = TRUE)
 			'TOPICS'			=>	$row['forum_topics'],
 			'LAST_POST_TIME'	=>	$last_post_time,
 			'LAST_POSTER'		=>	$last_poster,
-			'LAST_POST'			=>	$last_post,
 			'MODERATORS'		=>	$moderators_list,
 			'SUBFORUMS'			=>	$subforums_list,
 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 6873044195..bfd66f5cec 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1166,7 +1166,7 @@ include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 function topic_review($topic_id, $is_inline_review = false)
 {
 	global $user, $auth, $db, $template, $bbcode;
-	global $censors, $config, $phpbb_root_path, $phpEx;
+	global $censors, $config, $phpbb_root_path, $phpEx, $SID;
 
 	// Define censored word matches
 	if (empty($censors))
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index ffda1c02b5..7e1bc7a5f6 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -312,6 +312,7 @@ if ($forum_data['forum_postable'])
 		foreach ($row_ary as $row)
 		{
 			$topic_id = $row['topic_id'];
+			$replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
 
 			// Type and folder
 			$topic_type = '';