diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 16:40:01 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 16:40:01 +0200 |
| commit | e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83 (patch) | |
| tree | 43e2c07a830283973bf4246ca8ae43232fb29f5d /phpBB/includes/functions_content.php | |
| parent | a9ae1f83c7caa461ca2a13b9ef41f1b3140b7d22 (diff) | |
| parent | e9b00071dd1e7ae40a04e26d3f337d70bafbcf93 (diff) | |
| download | forums-e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83.tar forums-e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83.tar.gz forums-e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83.tar.bz2 forums-e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83.tar.xz forums-e65c51e3cd6f8ecd0a811b2671a94fef3fcf9d83.zip | |
Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-ascraeus
* github-prototech/ticket/11508:
[ticket/11508] Fix build_url test.
[ticket/11508] Add functional test for jumpbox.
[ticket/11508] Use $phpbb_path_helper.
[ticket/11508] Allow equal sign in parameter value.
[ticket/11508] Remove unnecessary implode.
[ticket/11508] Remove unnecessary isset check.
[ticket/11508] Fix build_url test.
[ticket/11508] Curly brace should be on its own line...
[ticket/11508] The question mark is expected even if there are no parameters.
[ticket/11508] Add tests.
[ticket/11508] Do not add the '?' unless there are parameters.
[ticket/11508] Change separator parameter to a simple true|false $is_amp.
[ticket/11508] Move helper functions to path_helper class.
[ticket/11508] Move the stripping param code to separate function as well.
[ticket/11508] Build the jumpbox hidden fields using the _form action_
[ticket/11508] Split parts of build_url() into reusable functions.
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index bb94967606..d56f02dd09 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -110,7 +110,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, */ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false) { - global $config, $auth, $template, $user, $db; + global $config, $auth, $template, $user, $db, $phpbb_path_helper; // We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality) if (!$config['load_jumpbox'] && $force_display === false) @@ -196,10 +196,13 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list $db->sql_freeresult($result); unset($padding_store); + $url_parts = $phpbb_path_helper->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; } |