aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/index.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-06-04 11:40:53 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-06-04 11:40:53 +0000
commit80f123acb32eaf4c7a0766ddca916f42f4b01bbe (patch)
tree98c48070cd4b00968da094564f17a5fc2bc18a41 /phpBB/adm/index.php
parentd46b1392b7ff3676978125b415389f99a98c2370 (diff)
downloadforums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar
forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.gz
forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.bz2
forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.tar.xz
forums-80f123acb32eaf4c7a0766ddca916f42f4b01bbe.zip
Too much for a minor; sorry
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8591 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
-rw-r--r--phpBB/adm/index.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 00acd1359a..c0fa2fdddb 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -28,14 +28,10 @@ $user->setup('acp/common');
// End session management
// Have they authenticated (again) as an admin for this session?
-if ($user->data['user_id'] != ANONYMOUS && (!isset($user->data['session_admin']) || !$user->data['session_admin']))
+if (!isset($user->data['session_admin']) || !$user->data['session_admin'])
{
login_box('', $user->lang['LOGIN_ADMIN_CONFIRM'], $user->lang['LOGIN_ADMIN_SUCCESS'], true, false);
}
-else if ($user->data['user_id'] == ANONYMOUS)
-{
- login_box('');
-}
// Is user any type of admin? No, then stop here, each script needs to
// check specific permissions but this is a catchall
@@ -112,7 +108,7 @@ function adm_page_header($page_title)
$template->assign_vars(array(
'PAGE_TITLE' => $page_title,
- 'USERNAME' => ($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '',
+ 'USERNAME' => $user->data['username'],
'SID' => $SID,
'_SID' => $_SID,
@@ -124,9 +120,6 @@ function adm_page_header($page_title)
'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"),
'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"),
- 'S_USER_ADMIN' => $user->data['session_admin'],
- 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS && !$user->data['is_bot']),
-
'T_IMAGES_PATH' => "{$phpbb_root_path}images/",
'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/",
'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/",