aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-01-27 18:59:38 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-01-27 18:59:38 +0000
commitb57ccb8cb9c597f14e9650ae3ef18afd13c1bd38 (patch)
tree4035ffeeff6a55d0950ffabfe23ada6465c6013f /phpBB/includes/functions.php
parent7253ee19caf5fdc030f2aa6fae851e8f6902f432 (diff)
downloadforums-b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38.tar
forums-b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38.tar.gz
forums-b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38.tar.bz2
forums-b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38.tar.xz
forums-b57ccb8cb9c597f14e9650ae3ef18afd13c1bd38.zip
fix admin_session "bug"
git-svn-id: file:///svn/phpbb/trunk@5083 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7a7de96fc5..a0530cf463 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1442,7 +1442,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
if (!defined('HEADER_INC'))
{
- if (defined('IN_ADMIN') && !empty($user->data['session_admin']))
+ if (defined('IN_ADMIN') && $user->data['session_admin'])
{
adm_page_header('', '', false);
}
@@ -1456,7 +1456,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$msg_title = (!isset($msg_title)) ? $user->lang['INFORMATION'] : ((!empty($user->lang[$msg_title])) ? $user->lang[$msg_title] : $msg_title);
$display_header = (!isset($display_header)) ? false : (bool) $display_header;
- if (defined('IN_ADMIN') && !empty($user->data['session_admin']))
+ if (defined('IN_ADMIN') && $user->data['session_admin'])
{
adm_page_message($msg_title, $msg_text, $display_header);
adm_page_footer();
@@ -1524,7 +1524,7 @@ function page_header($page_title = '')
// Get users online list ... if required
$l_online_users = $online_userlist = $l_online_record = '';
- if (!empty($config['load_online']) && !empty($config['load_online_time']))
+ if ($config['load_online'] && $config['load_online_time'])
{
$userlist_ary = $userlist_visible = array();
$logged_visible_online = $logged_hidden_online = $guests_online = $prev_user_id = 0;
@@ -1650,6 +1650,10 @@ function page_header($page_title = '')
$l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES';
$l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']);
}
+ else
+ {
+ $l_online_time = '';
+ }
$l_privmsgs_text = $l_privmsgs_text_unread = '';
$s_privmsg_new = false;
@@ -1822,4 +1826,4 @@ function page_footer()
exit;
}
-?>
+?> \ No newline at end of file