diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-03 14:51:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-03 14:51:07 +0000 |
| commit | b8cac003660894a3000430ab0004ec7d1fd55bdf (patch) | |
| tree | cef6590177f490d10739d7b5df894e2b05129243 | |
| parent | 7d4a25e73f2135fec1ff00180c34d4cf766617f7 (diff) | |
| download | forums-b8cac003660894a3000430ab0004ec7d1fd55bdf.tar forums-b8cac003660894a3000430ab0004ec7d1fd55bdf.tar.gz forums-b8cac003660894a3000430ab0004ec7d1fd55bdf.tar.bz2 forums-b8cac003660894a3000430ab0004ec7d1fd55bdf.tar.xz forums-b8cac003660894a3000430ab0004ec7d1fd55bdf.zip | |
Fix Bug #53545 - javascript error in template
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 3783aadab5..8d9ece5205 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -105,6 +105,7 @@ class mcp_queue { $template->assign_vars(array( 'S_TOPIC_REVIEW' => true, + 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'], 'TOPIC_TITLE' => $post_info['topic_title']) ); } diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 7bed20187a..e19fe96963 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -116,6 +116,7 @@ class mcp_reports { $template->assign_vars(array( 'S_TOPIC_REVIEW' => true, + 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'], 'TOPIC_TITLE' => $post_info['topic_title']) ); } @@ -429,7 +430,7 @@ class mcp_reports 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), 'TOPIC_ID' => $topic_id, 'TOTAL' => $total, - 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total), + 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total), ) ); @@ -671,7 +672,7 @@ function close_report($report_id_list, $mode, $action, $pm = false) $messenger->send($reporter['user_notify_type']); } } - + if (!$pm) { foreach ($post_info as $post) @@ -712,13 +713,13 @@ function close_report($report_id_list, $mode, $action, $pm = false) { $return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />'; } - + if (sizeof($topic_ids) === 1) { $return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />'; } } - + trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>')); } } |