diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
| commit | 4558262e2aaf31b4583a87622e97a46ead11537c (patch) | |
| tree | 88a589e5f9b3b45139c32718c1caf12a5e3b1374 /phpBB/viewtopic.php | |
| parent | 4b49b3dcf3bc369eaced5790b95914254ab7d932 (diff) | |
| parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
| download | forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.gz forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.bz2 forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.xz forums-4558262e2aaf31b4583a87622e97a46ead11537c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12013] Fix functional tests and sniffer issue.
[ticket/12013] Clear the jumpbox.
[ticket/12013] Add moderator tools icon.
[ticket/12013] Remove obsolete jumpbox and quickmod CSS.
[ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
[ticket/12013] Update to use the new .button class.
[ticket/12013] Add missing class to place the buttons on the rightside.
[ticket/12013] Use the correct variable for the forum id.
[ticket/12013] Use DEFINE instead of Twig's set.
[ticket/12013] Use path helper.
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index d87f7de2b0..23f2fe8e3d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -523,6 +523,19 @@ gen_forum_auth_level('topic', $forum_id, $topic_data['forum_status']); // Quick mod tools $allow_change_type = ($auth->acl_get('m_', $forum_id) || ($user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster'])) ? true : false; +$s_quickmod_action = append_sid( + "{$phpbb_root_path}mcp.$phpEx", + array( + 'f' => $forum_id, + 't' => $topic_id, + 'start' => $start, + 'quickmod' => 1, + 'redirect' => urlencode(str_replace('&', '&', $viewtopic_url)), + ), + true, + $user->session_id +); + $quickmod_array = array( // 'key' => array('LANG_KEY', $userHasPermissions), @@ -546,7 +559,7 @@ foreach($quickmod_array as $option => $qm_ary) { if (!empty($qm_ary[1])) { - phpbb_add_quickmod_option($option, $qm_ary[0]); + phpbb_add_quickmod_option($s_quickmod_action, $option, $qm_ary[0]); } } @@ -631,7 +644,7 @@ $template->assign_vars(array( 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SINGLE_MODERATOR' => (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true, 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")), - 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . "&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), + 'S_MOD_ACTION' => $s_quickmod_action, 'L_RETURN_TO_FORUM' => $user->lang('RETURN_TO', $topic_data['forum_name']), 'S_VIEWTOPIC' => true, |