diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:26:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-07-28 13:26:20 +0000 |
| commit | 8904d95d59d14d00fd3cfaf93a357ad68d608586 (patch) | |
| tree | fca6bd8bf7ad6b7db00a0c298b2b2effac104fb0 /phpBB/includes | |
| parent | f909a190d88f7f17d15cfca76c1e978bca32340d (diff) | |
| download | forums-8904d95d59d14d00fd3cfaf93a357ad68d608586.tar forums-8904d95d59d14d00fd3cfaf93a357ad68d608586.tar.gz forums-8904d95d59d14d00fd3cfaf93a357ad68d608586.tar.bz2 forums-8904d95d59d14d00fd3cfaf93a357ad68d608586.tar.xz forums-8904d95d59d14d00fd3cfaf93a357ad68d608586.zip | |
tiny alterations/bugfixes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8691 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/cache.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
3 files changed, 11 insertions, 6 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) |