diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-10-09 10:18:14 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-10-09 10:18:14 -0500 |
| commit | e1ed30a40886a26ec1291ebefad9f959766d485b (patch) | |
| tree | 8f5a91df6a961f81e211b7bd38e6ba1969dd7f53 /phpBB/includes/functions.php | |
| parent | cba383d139a313d0742d06f6ee8bee91332a1c7b (diff) | |
| download | forums-e1ed30a40886a26ec1291ebefad9f959766d485b.tar forums-e1ed30a40886a26ec1291ebefad9f959766d485b.tar.gz forums-e1ed30a40886a26ec1291ebefad9f959766d485b.tar.bz2 forums-e1ed30a40886a26ec1291ebefad9f959766d485b.tar.xz forums-e1ed30a40886a26ec1291ebefad9f959766d485b.zip | |
[ticket/11898] Correct admin S_LOGIN_ACTION
PHPBB3-11898
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e1f96c0b1e..dd0dcc09b6 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5124,7 +5124,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum') { global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path; - global $phpbb_dispatcher, $request, $phpbb_container, $adm_relative_path; + global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path; if (defined('HEADER_INC')) { @@ -5423,7 +5423,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_FORUM_ID' => $forum_id, 'S_TOPIC_ID' => $topic_id, - 'S_LOGIN_ACTION' => ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("{$phpbb_root_path}{$adm_relative_path}index.$phpEx", false, true, $user->session_id)), + 'S_LOGIN_ACTION' => ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("{$phpbb_admin_path}index.$phpEx", false, true, $user->session_id)), 'S_LOGIN_REDIRECT' => build_hidden_fields(array('redirect' => build_url())), 'S_ENABLE_FEEDS' => ($config['feed_enable']) ? true : false, |