mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

fixing bug #1860

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5920 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-17 16:26:54 +00:00
parent 6a1591f2be
commit 7ba89a0b2d
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/acm/acm_main.php
View File

@ -28,7 +28,7 @@ class cache extends acm
{
global $db;
if ($config = $this->get('config'))
if (($config = $this->get('config')) !== false)
{
$sql = 'SELECT config_name, config_value
FROM ' . CONFIG_TABLE . '
@ -79,7 +79,7 @@ class cache extends acm
return false;
}
if (!($censors = $this->get('word_censors')))
if (($censors = $this->get('word_censors')) === false)
{
$sql = 'SELECT word, replacement
FROM ' . WORDS_TABLE;
@ -104,7 +104,7 @@ class cache extends acm
*/
function obtain_icons(&$icons)
{
if (!($icons = $this->get('icons')))
if (($icons = $this->get('icons')) === false)
{
global $db;
@ -135,7 +135,7 @@ class cache extends acm
*/
function obtain_ranks(&$ranks)
{
if (!($ranks = $this->get('ranks')))
if (($ranks = $this->get('ranks')) === false)
{
global $db;
@ -176,7 +176,7 @@ class cache extends acm
*/
function obtain_attach_extensions(&$extensions, $forum_id = false)
{
if (!($extensions = $this->get('_extensions')))
if (($extensions = $this->get('_extensions')) === false)
{
global $db;
@ -257,7 +257,7 @@ class cache extends acm
*/
function obtain_bots(&$bots)
{
if (!($bots = $this->get('bots')))
if (($bots = $this->get('bots')) === false)
{
global $db;
@ -288,6 +288,7 @@ class cache extends acm
}
$result = $db->sql_query($sql);
$bots = array();
while ($row = $db->sql_fetchrow($result))
{
$bots[] = $row;
@ -317,7 +318,7 @@ class cache extends acm
{
$parsed_array = $this->get('_cfg_' . $key . '_' . $theme[$key . '_path']);
if (!$parsed_array)
if ($parsed_array === false)
{
$parsed_array = array();
}

1
phpBB/includes/acp/auth.php
View File

@ -38,6 +38,7 @@ class auth_admin extends auth
$result = $db->sql_query($sql);
$global = $local = 0;
$this->acl_options = array();
while ($row = $db->sql_fetchrow($result))
{
if ($row['is_global'])

3
phpBB/includes/auth.php
View File

@ -29,7 +29,7 @@ class auth
$this->acl = $this->cache = $this->acl_options = array();
$this->acl_forum_ids = false;
if (!($this->acl_options = $cache->get('acl_options')))
if (($this->acl_options = $cache->get('acl_options')) === false)
{
$sql = 'SELECT auth_option, is_global, is_local
FROM ' . ACL_OPTIONS_TABLE . '
@ -37,6 +37,7 @@ class auth
$result = $db->sql_query($sql);
$global = $local = 0;
$this->acl_options = array();
while ($row = $db->sql_fetchrow($result))
{
if ($row['is_global'])

2
phpBB/includes/functions_module.php
View File

@ -52,7 +52,7 @@ class p_master
$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
// Get cached modules
if (!($this->module_cache = $cache->get('_modules_' . $this->p_class)))
if (($this->module_cache = $cache->get('_modules_' . $this->p_class)) === false)
{
// Get modules
$sql = 'SELECT *

2
phpBB/includes/session.php
View File

@ -118,7 +118,7 @@ class session
$this->page = $this->extract_current_page($phpbb_root_path);
$this->page['page'] .= (isset($_POST['f'])) ? ((strpos($this->page['page'], '?') !== false) ? '&' : '?') . 'f=' . intval($_POST['f']) : '';
$this->cookie_data = array();
$this->cookie_data = array('u' => 0, 'k' => '');
if (isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_u']))
{
// Switch to request_var ... can this cause issues, can a _GET/_POST param