diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2012-03-08 22:04:56 +0000 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-03-19 08:27:32 -0400 |
| commit | 28c6b95100014bc9237c50c16e6b69a96102e7c6 (patch) | |
| tree | 246045a452cb3f1b9c67971e29d7f700273876c6 | |
| parent | 165a2d1aa879f1fc65448721da5f6d143aff91fe (diff) | |
| download | forums-28c6b95100014bc9237c50c16e6b69a96102e7c6.tar forums-28c6b95100014bc9237c50c16e6b69a96102e7c6.tar.gz forums-28c6b95100014bc9237c50c16e6b69a96102e7c6.tar.bz2 forums-28c6b95100014bc9237c50c16e6b69a96102e7c6.tar.xz forums-28c6b95100014bc9237c50c16e6b69a96102e7c6.zip | |
[feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.
PHPBB3-10600
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_topic_review.html | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index b4756b2600..69c6a4cfff 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -116,8 +116,9 @@ class mcp_reports $template->assign_vars(array( 'S_TOPIC_REVIEW' => true, 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'], - 'TOPIC_TITLE' => $post_info['topic_title']) - ); + 'TOPIC_TITLE' => $post_info['topic_title'], + 'REPORTED_POST_ID' => $post_id, + )); } $topic_tracking_info = $extensions = $attachments = array(); @@ -226,7 +227,7 @@ class mcp_reports 'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']), 'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']), - 'POST_PREVIEW' => $report['reported_post_text'], + 'POST_PREVIEW' => bbcode_nl2br($report['reported_post_text']), 'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'], 'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_IP' => $post_info['poster_ip'], diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index a022048c34..1c4b67044d 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -17,7 +17,7 @@ <div class="inner"><span class="corners-top"><span></span></span> {topic_review_row.L_IGNORE_POST} <!-- ELSE --> - <div class="post <!-- IF topic_review_row.POST_ID == REPORTED_POST_ID -->reported<!-- ELSEIF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> + <div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> reported<!-- ENDIF -->"> <div class="inner"><span class="corners-top"><span></span></span> <!-- ENDIF --> |