makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

tiny alterations/bugfixes

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8691 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-07-28 13:26:20 +00:00
parent f909a190d8
commit 8904d95d59
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/cache.php
View file

@ -63,7 +63,7 @@ class cache extends acm
$this->put('config', $cached_config); $this->put('config', $cached_config);
} }
return $config; return $config;
} }
@ -103,7 +103,7 @@ class cache extends acm
if (($icons = $this->get('_icons')) === false) if (($icons = $this->get('_icons')) === false)
{ {
global $db; global $db;
// Topic icons // Topic icons
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . ICONS_TABLE . ' FROM ' . ICONS_TABLE . '
@ -134,7 +134,7 @@ class cache extends acm
if (($ranks = $this->get('_ranks')) === false) if (($ranks = $this->get('_ranks')) === false)
{ {
global $db; global $db;
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . RANKS_TABLE . ' FROM ' . RANKS_TABLE . '
ORDER BY rank_min DESC'; ORDER BY rank_min DESC';
@ -284,7 +284,7 @@ class cache extends acm
if (($bots = $this->get('_bots')) === false) if (($bots = $this->get('_bots')) === false)
{ {
global $db; global $db;
switch ($db->sql_layer) switch ($db->sql_layer)
{ {
case 'mssql': case 'mssql':
@ -321,7 +321,7 @@ class cache extends acm
$this->put('_bots', $bots); $this->put('_bots', $bots);
} }
return $bots; return $bots;
} }

5
phpBB/includes/functions.php
View file

@ -320,6 +320,11 @@ function phpbb_hash($password)
/** /**
* Check for correct 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) function phpbb_check_hash($password, $hash)
{ {

2
phpBB/includes/session.php
View file

@ -1854,7 +1854,7 @@ class user extends session
if ((@include $language_filename) === false) 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) else if ($use_db)

2
phpBB/viewtopic.php
View file

@ -176,6 +176,7 @@ $sql_array = array(
'FROM' => array( 'FROM' => array(
FORUMS_TABLE => 'f', FORUMS_TABLE => 'f',
TOPICS_TABLE => 't',
) )
); );
@ -239,7 +240,6 @@ else
} }
$sql_array['WHERE'] .= ')'; $sql_array['WHERE'] .= ')';
$sql_array['FROM'][TOPICS_TABLE] = 't';
// Join to forum table on topic forum_id unless topic forum_id is zero // 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 // whereupon we join on the forum_id passed as a parameter ... this