diff --git a/phpBB/index.php b/phpBB/index.php
index 73d4ff59fb..1c9c1a0738 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -106,8 +106,8 @@ if($total_categories)
 	for($i = 0; $i < $total_categories; $i++)
 	{
 		$template->assign_block_vars("catrow",
-			array("CAT_ID" => $category_rows[$i]["cat_id"],
-				"PHP_SELF" => $PHP_SELF,
+			array(
+				"CAT_ID" => $category_rows[$i]["cat_id"],
 				"POST_FORUM_URL" => POST_FORUM_URL,
 				"CAT_DESC" => stripslashes($category_rows[$i]["cat_title"])
 			)
@@ -165,7 +165,6 @@ if($total_categories)
 					"FORUM_ID" => $forum_rows[$j]["forum_id"],
 					"FORUM_DESC" => stripslashes($forum_rows[$j]["forum_desc"]),
 					"ROW_COLOR" => $row_color,
-					"PHPEX" => $phpEx,
 					"POSTS" => $forum_rows[$j]["forum_posts"],
 					"TOPICS" => $forum_rows[$j]["forum_topics"],
 					"LAST_POST" => $last_post,
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 6e4aedcd2c..cada2b70c4 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -62,7 +62,6 @@ if(!$onlinerow)
 }
 
 $template->assign_vars(array(
-	"PHP_SELF" => $PHP_SELF,
 	"POST_FORUM_URL" => POST_FORUM_URL,
 	"POST_USER_URL" => POST_USERS_URL,
 	"L_WHOSONLINE" => $l_whosonline,
@@ -175,7 +174,8 @@ if($online_count)
 		if($logged_on)
 		{
 			$template->assign_block_vars("userrow", 
-				array("ROW_COLOR" => $row_color,
+				array(
+					"ROW_COLOR" => $row_color,
 					"USER_ID" => $onlinerow[$i]['user_id'],
 					"USERNAME" => $username,
 					"LOGGED_ON" => $logged_on,