From 91246c20fa8b9218fe0ddc8b52236d4b878346dd Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 23:07:40 +0000
Subject: [ticket/11171] Adapted the code in report.php

Added the variable aliases needed (to look and feel the same as
it was before)
Added the variables into  the table insert.

PHPBB3-11171
---
 phpBB/report.php | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'phpBB/report.php')

diff --git a/phpBB/report.php b/phpBB/report.php
index d792b8df6a..be38bad2f3 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -71,11 +71,14 @@ if ($post_id)
 		trigger_error('POST_NOT_EXIST');
 	}
 
-	$forum_id 				= (int) $report_data['forum_id'];
-	$topic_id 				= (int) $report_data['topic_id'];
-	$reported_post_text		= $report_data['post_text'];
-	$reported_post_bitfield	= $report_data['bbcode_bitfield'];
-	$reported_post_uid		= $report_data['bbcode_uid'];
+	$forum_id 							= (int) $report_data['forum_id'];
+	$topic_id 							= (int) $report_data['topic_id'];
+	$reported_post_text					= $report_data['post_text'];
+	$reported_post_bitfield				= $report_data['bbcode_bitfield'];
+	$reported_post_uid					= $report_data['bbcode_uid'];
+	$reported_post_enable_bbcode		= $report_data['enable_bbcode'];
+	$reported_post_enable_smilies		= $report_data['enable_smilies'];
+	$reported_post_enable_magic_url		= $report_data['enable_magic_url'];
 
 	$sql = 'SELECT *
 		FROM ' . FORUMS_TABLE . '
@@ -134,9 +137,11 @@ else
 		trigger_error($message);
 	}
 	
-	$reported_post_text 	= $report_data['message_text'];
-	$reported_post_bitfield	= $report_data['bbcode_bitfield'];
-	$reported_post_uid		= $report_data['bbcode_uid'];
+	$reported_post_text 				= $report_data['message_text'];
+	$reported_post_bitfield				= $report_data['bbcode_bitfield'];
+	$reported_post_enable_bbcode		= $report_data['reported_post_enable_bbcode'];
+	$reported_post_enable_smilies		= $report_data['reported_post_enable_smilies'];
+	$reported_post_enable_magic_url		= $report_data['reported_post_enable_magic_url'];
 }
 
 // Submit report?
@@ -155,17 +160,20 @@ if ($submit && $reason_id)
 	}
 
 	$sql_ary = array(
-		'reason_id'				=> (int) $reason_id,
-		'post_id'				=> $post_id,
-		'pm_id'					=> $pm_id,
-		'user_id'				=> (int) $user->data['user_id'],
-		'user_notify'			=> (int) $user_notify,
-		'report_closed'			=> 0,
-		'report_time'			=> (int) time(),
-		'report_text'			=> (string) $report_text,
-		'reported_post_text'	=> $reported_post_text,
-		'reported_post_uid'		=> $reported_post_uid,
-		'reported_post_bitfield'=> $reported_post_bitfield,
+		'reason_id'							=> (int) $reason_id,
+		'post_id'							=> $post_id,
+		'pm_id'								=> $pm_id,
+		'user_id'							=> (int) $user->data['user_id'],
+		'user_notify'						=> (int) $user_notify,
+		'report_closed'						=> 0,
+		'report_time'						=> (int) time(),
+		'report_text'						=> (string) $report_text,
+		'reported_post_text'				=> $reported_post_text,
+		'reported_post_uid'					=> $reported_post_uid,
+		'reported_post_bitfield'			=> $reported_post_bitfield,
+		'reported_post_enable_bbcode'		=> $reported_post_enable_bbcode,
+		'reported_post_enable_smilies'		=> $reported_post_enable_smilies,
+		'reported_post_enable_magic_url'	=> $reported_post_enable_magic_url,
 	);
 
 	$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-- 
cgit v1.2.3-65-gdbad