mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

my turn to break the forum (and at least pm's are no longer working - will not last long). HARRRR

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4978 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2004-09-04 19:32:23 +00:00
parent 68d73caefc
commit 57b188b7af
32 changed files with 1311 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
phpBB/includes/session.php
View File

@@ -476,7 +476,7 @@ class user extends session
var $lang_path;
var $img_lang;
var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'html' => 7, 'bbcode' => 8, 'smile' => 9, 'popuppm' => 10);
var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'html' => 7, 'bbcode' => 8, 'smile' => 9, 'popuppm' => 10, 'report_pm_notify' => 11);
var $keyvalues = array();
function setup($lang_set = false, $style = false)
@@ -571,34 +571,11 @@ class user extends session
// Set theme info
$theme_info = array();
$default_theme_info = array(
'pagination_sep' => ', ',
'pagination_goto_page' => true,
'avatar_img_class' => ''
);
foreach ($this->theme as $style_priority => $row)
// Add to template database
foreach (array_keys($this->theme) as $style_priority)
{
if (file_exists($phpbb_root_path . 'styles/' . $row['theme_path'] . '/theme/theme_info.' . $phpEx))
{
$theme_info = array();
include($phpbb_root_path . 'styles/' . $row['theme_path'] . '/theme/theme_info.' . $phpEx);
if (sizeof($theme_info))
{
$this->theme[$style_priority] = array_merge($this->theme[$style_priority], $theme_info);
}
}
foreach ($default_theme_info as $key => $value)
{
if (!isset($this->theme[$style_priority][$key]))
{
$this->theme[$style_priority][$key] = $value;
}
}
$this->theme[$style_priority]['pagination_sep'] = ', ';
}
unset($theme_info, $default_theme_info);
$template->set_template();
@@ -776,7 +753,7 @@ class user extends session
if (empty($imgs[$img . $suffix]) || $width)
{
if (!$this->theme['primary'][$img])
if (!isset($this->theme['primary'][$img]) || !$this->theme['primary'][$img])
{
// Do not fill the image to let designers decide what to do if the image is empty
$imgs[$img . $suffix] = '';