diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-06 00:48:04 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-06 00:48:04 +0000 |
| commit | e22a26609ff5aec463fb97d648e05deca84d7f09 (patch) | |
| tree | 70ecfc3510f1709eac294d071f9c3baaddda4b83 | |
| parent | e5162e7496c2ae9ef5e5a874dab8e0a0409f3d74 (diff) | |
| download | forums-e22a26609ff5aec463fb97d648e05deca84d7f09.tar forums-e22a26609ff5aec463fb97d648e05deca84d7f09.tar.gz forums-e22a26609ff5aec463fb97d648e05deca84d7f09.tar.bz2 forums-e22a26609ff5aec463fb97d648e05deca84d7f09.tar.xz forums-e22a26609ff5aec463fb97d648e05deca84d7f09.zip | |
Remove reported flag from shadow topics when closing reports. #19765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8833 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 08ce0606e7..97c1d0df93 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -114,6 +114,7 @@ <li>[Fix] Correctly limit input of the users location to 100 characters in the UCP and ACP. (Bug #32655)</li> <li>[Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)</li> <li>[Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)</li> + <li>[Fix] Remove reported flag from shadow topics when closing reports. (Bug #19765)</li> </ul> diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index ce55fec7df..e1a8111c29 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -555,7 +555,8 @@ function close_report($report_id_list, $mode, $action) { $sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_reported = 0 - WHERE ' . $db->sql_in_set('topic_id', $close_report_topics); + WHERE ' . $db->sql_in_set('topic_id', $close_report_topics) . ' + OR ' . $db->sql_in_set('topic_moved_id', $close_report_topics); $db->sql_query($sql); } } |