diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-30 14:05:40 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-30 14:05:40 +0200 |
| commit | d4f1bdea3bdd27f7c9f99d6121b2762482fc1707 (patch) | |
| tree | b730fdcc1fe5c486806728474b20944c982dfa75 /phpBB/report.php | |
| parent | cab437ae83297a8fc092fe77fdae8eb66d3b93a1 (diff) | |
| parent | 29a904ce45f16eac928aa516be366780f05c0950 (diff) | |
| download | forums-d4f1bdea3bdd27f7c9f99d6121b2762482fc1707.tar forums-d4f1bdea3bdd27f7c9f99d6121b2762482fc1707.tar.gz forums-d4f1bdea3bdd27f7c9f99d6121b2762482fc1707.tar.bz2 forums-d4f1bdea3bdd27f7c9f99d6121b2762482fc1707.tar.xz forums-d4f1bdea3bdd27f7c9f99d6121b2762482fc1707.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher
* upstream/develop: (35 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
[ticket/10703] Added a condition to check if ext directory exists
[ticket/10708] Check converted passwords for multi-byte characters
[ticket/10586] Tests finally work (thanks naderman)
[ticket/10586] Correctly purge board cache and don't rename install directory
[ticket/10586] trying to get tests to work
[ticket/10586] more work on getting tests to pass
[ticket/10586] Tests are coming along, just a little more to go
[ticket/10586] Rename install directory back to install/ after tests
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
[ticket/10586] initial work on copying fixtures. Note that this depends on 10706
[ticket/10586] Adding the extensions used by the tests
[ticket/10586] Now tests run, but fail. But here is what I have.
...
Diffstat (limited to 'phpBB/report.php')
| -rw-r--r-- | phpBB/report.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/report.php b/phpBB/report.php index e29001d389..29b46a6211 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -71,8 +71,9 @@ if ($post_id) trigger_error('POST_NOT_EXIST'); } - $forum_id = (int) $report_data['forum_id']; - $topic_id = (int) $report_data['topic_id']; + $forum_id = (int) $report_data['forum_id']; + $topic_id = (int) $report_data['topic_id']; + $reported_post_text = $report_data['post_text']; $sql = 'SELECT * FROM ' . FORUMS_TABLE . ' @@ -130,6 +131,8 @@ else $message .= '<br /><br />' . sprintf($user->lang['RETURN_PM'], '<a href="' . $redirect_url . '">', '</a>'); trigger_error($message); } + + $reported_post_text = $report_data['message_text']; } // Submit report? @@ -155,7 +158,8 @@ if ($submit && $reason_id) 'user_notify' => (int) $user_notify, 'report_closed' => 0, 'report_time' => (int) time(), - 'report_text' => (string) $report_text + 'report_text' => (string) $report_text, + 'reported_post_text' => $reported_post_text, ); $sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); |