mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity

[ticket/11508] Build the jumpbox hidden fields using the _form action_

Browse Source 
PHPBB3-11508
This commit is contained in:
Cesar G 2013-11-09 23:18:10 -08:00
parent c96ade8463
commit ef4202d859
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions.php
View File

@ -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'] : '',

8
phpBB/includes/functions_content.php
View File

@ -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;
}