diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-14 12:16:59 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-14 12:16:59 -0600 |
| commit | a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (patch) | |
| tree | 24ebda96b46c244fd4247fbae3991c376530af75 /phpBB/report.php | |
| parent | 62279d46a60e695a71c4748f8722975a37f488bc (diff) | |
| parent | 9eecaa21e3fe23c0c1afc7f8d057754fca68e9a6 (diff) | |
| download | forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.gz forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.bz2 forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.xz forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.zip | |
Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
[ticket/11171] Moved the DB schema changes to its place
[ticket/11171] Cleanup of leftovers
[ticket/11171] Adapted the code in report.php
[ticket/11171] Use the options stored to decide how to show it
[ticket/11171] DB changes for the update
[ticket/11171] DB additions for these changes
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
Diffstat (limited to 'phpBB/report.php')
| -rw-r--r-- | phpBB/report.php | 46 |
1 files changed, 27 insertions, 19 deletions
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); |