diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 2 | 
2 files changed, 3 insertions, 3 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, diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index bfd669fdfa..1be6e49471 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -505,7 +505,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test  		'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),  		'table_prefix'	=> $data['table_prefix'], -		'adm_relative_path'	=> 'adm/', +		'phpbb_adm_relative_path'	=> 'adm/',  		'acm_type'		=> 'phpbb\cache\driver\file',  	);  | 
