diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-09 22:06:20 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-07-04 00:56:03 -0700 |
| commit | 90a8c7e29af020050b589fb8b7485fb9ac67fc7e (patch) | |
| tree | af1eb349bd9a10530ca66576aa227a365be371f0 /phpBB/includes/functions_content.php | |
| parent | c1627ef52e398327cf99a2cbd62334a7057f8feb (diff) | |
| download | forums-90a8c7e29af020050b589fb8b7485fb9ac67fc7e.tar forums-90a8c7e29af020050b589fb8b7485fb9ac67fc7e.tar.gz forums-90a8c7e29af020050b589fb8b7485fb9ac67fc7e.tar.bz2 forums-90a8c7e29af020050b589fb8b7485fb9ac67fc7e.tar.xz forums-90a8c7e29af020050b589fb8b7485fb9ac67fc7e.zip | |
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
PHPBB3-12013
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 09bd3e6cdb..f631b91e8d 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -174,8 +174,9 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list $template->assign_block_vars('jumpbox_forums', array( 'FORUM_ID' => ($select_all) ? 0 : -1, 'FORUM_NAME' => ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'], - 'S_FORUM_COUNT' => $iteration) - ); + 'S_FORUM_COUNT' => $iteration, + 'LINK' => phpbb_append_url_param($action, 'f', $forum_id), + )); $iteration++; $display_jumpbox = true; @@ -188,8 +189,9 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list 'S_FORUM_COUNT' => $iteration, 'S_IS_CAT' => ($row['forum_type'] == FORUM_CAT) ? true : false, 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false) - ); + 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false, + 'LINK' => phpbb_append_url_param($action, 'f', $row['forum_id']), + )); for ($i = 0; $i < $padding; $i++) { @@ -1452,16 +1454,18 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', /** * Add an option to the quick-mod tools. * + * @param string $url The recepting URL for the quickmod actions. * @param string $option The language key for the value of the option. * @param string $lang_string The language string to use. */ -function phpbb_add_quickmod_option($option, $lang_string) +function phpbb_add_quickmod_option($url, $option, $lang_string) { global $template, $user; $lang_string = $user->lang($lang_string); $template->assign_block_vars('quickmod', array( - 'VALUE' => $option, - 'TITLE' => $lang_string, + 'VALUE' => $option, + 'TITLE' => $lang_string, + 'LINK' => phpbb_append_url_param($url, 'action', $option), )); } |