diff options
| -rw-r--r-- | phpBB/includes/functions.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 49b7293ed6..aa09b90b35 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2437,7 +2437,7 @@ function phpbb_get_url_parts($url, $separator = '&') { * Glue URL parameters together * * @param array $params URL parameters in the form of array(name => value) -* @return array Returns the glued string. +* @return string Returns the glued string. */ function phpbb_glue_url_params($params) { $_params = array(); @@ -2452,6 +2452,7 @@ function phpbb_glue_url_params($params) { /** * Append parameters to an already built URL. * +* @param string $url URL to append parameters to * @param array $new_params Parameters to add in the form of array(name => value) * @return string Returns the new URL. */ @@ -4965,7 +4966,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = } } - $hidden_fields_for_jumpbox = phpbb_build_hidden_fields_for_query_params($request, array('f')); $notification_mark_hash = generate_link_hash('mark_all_notifications_read'); // The following assigns all _common_ variables that may be used at any point in a template. @@ -4982,7 +4982,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => $l_online_record, 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, - 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index b1f69c5756..387695a9e8 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -195,11 +195,13 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list } $db->sql_freeresult($result); unset($padding_store); + $url_parts = phpbb_get_url_parts($action); $template->assign_vars(array( - 'S_DISPLAY_JUMPBOX' => $display_jumpbox, - 'S_JUMPBOX_ACTION' => $action) - ); + 'S_DISPLAY_JUMPBOX' => $display_jumpbox, + 'S_JUMPBOX_ACTION' => $action, + 'HIDDEN_FIELDS_FOR_JUMPBOX' => build_hidden_fields($url_parts['params']), + )); return; } |