diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 11:43:38 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 11:43:38 -0400 |
| commit | fab7f5fdfd2fd8ec50dae52dfde80a706015dd74 (patch) | |
| tree | 47806310ae927e46a6128652ce37ae85a138fa45 /phpBB | |
| parent | 2bc918d3f9282de887cc09f830ff35073865366e (diff) | |
| download | forums-fab7f5fdfd2fd8ec50dae52dfde80a706015dd74.tar forums-fab7f5fdfd2fd8ec50dae52dfde80a706015dd74.tar.gz forums-fab7f5fdfd2fd8ec50dae52dfde80a706015dd74.tar.bz2 forums-fab7f5fdfd2fd8ec50dae52dfde80a706015dd74.tar.xz forums-fab7f5fdfd2fd8ec50dae52dfde80a706015dd74.zip | |
[ticket/11215] Don't try to use when it isn't there
PHPBB3-112515
Diffstat (limited to 'phpBB')
| -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 40583dee54..f637ab2232 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5059,7 +5059,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; + global $phpbb_dispatcher, $request, $phpbb_container, $symfony_request; if (defined('HEADER_INC')) { @@ -5219,7 +5219,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 // This path is sent with the base template paths in the assign_vars() // call below. We need to correct it in case we are accessing from a // controller because the web paths will be incorrect otherwise. - $corrected_path = phpbb_get_web_root_path(phpbb_create_symfony_request($request)); + $corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request) : ''; $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path; // Send a proper content-language to the output |