4 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index 31b8b73e10..fc9a01ae4e 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -63,7 +63,7 @@ class cache extends acm
 
 			$this->put('config', $cached_config);
 		}
-	
+
 		return $config;
 	}
 
@@ -103,7 +103,7 @@ class cache extends acm
 		if (($icons = $this->get('_icons')) === false)
 		{
 			global $db;
-	
+
 			// Topic icons
 			$sql = 'SELECT *
 				FROM ' . ICONS_TABLE . '
@@ -134,7 +134,7 @@ class cache extends acm
 		if (($ranks = $this->get('_ranks')) === false)
 		{
 			global $db;
-	
+
 			$sql = 'SELECT *
 				FROM ' . RANKS_TABLE . '
 				ORDER BY rank_min DESC';
@@ -284,7 +284,7 @@ class cache extends acm
 		if (($bots = $this->get('_bots')) === false)
 		{
 			global $db;
-	
+
 			switch ($db->sql_layer)
 			{
 				case 'mssql':
@@ -321,7 +321,7 @@ class cache extends acm
 
 			$this->put('_bots', $bots);
 		}
-	
+
 		return $bots;
 	}
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8c194f4fc2..3f4d2743fc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -320,6 +320,11 @@ function phpbb_hash($password)
 
 /**
 * Check for correct password
+*
+* @param string $password The password in plain text
+* @param string $hash The stored password hash
+*
+* @return bool Returns true if the password is correct, false if not.
 */
 function phpbb_check_hash($password, $hash)
 {
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 958833ece7..b2a9bd2559 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1854,7 +1854,7 @@ class user extends session
 
 			if ((@include $language_filename) === false)
 			{
-				trigger_error('Language file ' . basename($language_filename) . ' couldn\'t be opened.', E_USER_ERROR);
+				trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
 			}
 		}
 		else if ($use_db)
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 0fafefad1e..350aef2c11 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -176,6 +176,7 @@ $sql_array = array(
 
 	'FROM'		=> array(
 		FORUMS_TABLE	=> 'f',
+		TOPICS_TABLE	=> 't',
 	)
 );
 
@@ -239,7 +240,6 @@ else
 }
 
 $sql_array['WHERE'] .= ')';
-$sql_array['FROM'][TOPICS_TABLE] = 't';
 
 // Join to forum table on topic forum_id unless topic forum_id is zero
 // whereupon we join on the forum_id passed as a parameter ... this