diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 12:51:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-16 12:51:36 +0000 |
| commit | de0bc7476abda4b590eaad8b3b43e1549f0c62da (patch) | |
| tree | 9b2b625951c824afb5d9e053fcf5ad76ceae1dc0 | |
| parent | ca07af715ff64da81f7403abf6404ee6feefaa3c (diff) | |
| download | forums-de0bc7476abda4b590eaad8b3b43e1549f0c62da.tar forums-de0bc7476abda4b590eaad8b3b43e1549f0c62da.tar.gz forums-de0bc7476abda4b590eaad8b3b43e1549f0c62da.tar.bz2 forums-de0bc7476abda4b590eaad8b3b43e1549f0c62da.tar.xz forums-de0bc7476abda4b590eaad8b3b43e1549f0c62da.zip | |
Do not display reported topic icon for shadow topics. (Bug #13970)
git-svn-id: file:///svn/phpbb/trunk@8854 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 9bbbeb2240..71471a230c 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -657,8 +657,8 @@ function mcp_move_topic($topic_ids) 'forum_id' => (int) $row['forum_id'], 'icon_id' => (int) $row['icon_id'], 'topic_attachment' => (int) $row['topic_attachment'], - 'topic_approved' => 1, - 'topic_reported' => (int) $row['topic_reported'], + 'topic_approved' => 1, // a shadow topic is always approved + 'topic_reported' => 0, // a shadow topic is never reported 'topic_title' => (string) $row['topic_title'], 'topic_poster' => (int) $row['topic_poster'], 'topic_time' => (int) $row['topic_time'], diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 06199e52f7..1314a0bb33 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -503,6 +503,7 @@ if (sizeof($shadow_topic_list)) 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], 'topic_status' => $rowset[$orig_topic_id]['topic_status'], 'topic_type' => $rowset[$orig_topic_id]['topic_type'], + 'topic_reported' => $rowset[$orig_topic_id]['topic_reported'], )); $rowset[$orig_topic_id] = $row; |