aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-07-09 17:14:12 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-07-09 17:14:12 +0000
commit2bb247d2bd62bf2e089bd6da11c67cf9e47a697c (patch)
treece5f96b8e7f262d125e018ef07f14baf508a7c99 /phpBB/includes/functions.php
parentf75dd43d55512479dbcaf78a8a575828e5b769ed (diff)
downloadforums-2bb247d2bd62bf2e089bd6da11c67cf9e47a697c.tar
forums-2bb247d2bd62bf2e089bd6da11c67cf9e47a697c.tar.gz
forums-2bb247d2bd62bf2e089bd6da11c67cf9e47a697c.tar.bz2
forums-2bb247d2bd62bf2e089bd6da11c67cf9e47a697c.tar.xz
forums-2bb247d2bd62bf2e089bd6da11c67cf9e47a697c.zip
#13121
#13093 git-svn-id: file:///svn/phpbb/trunk@7851 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index caf26bf379..d4947a9ca0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2235,7 +2235,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
- 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
'S_LOGIN_ACTION' => (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
'S_HIDDEN_FIELDS' => $s_hidden_fields,
@@ -4134,6 +4133,7 @@ function page_header($page_title = '', $display_online_list = true)
'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false,
+ 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false,
'S_REGISTERED_USER' => $user->data['is_registered'],
'S_IS_BOT' => $user->data['is_bot'],