diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 11:55:06 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 11:55:06 +0100 |
| commit | 6e93fee9d2f5951ff85bf658e3da42e4f6d153ec (patch) | |
| tree | f9b5c524f77ab0e3c6cd6c0d50612f553dd6a960 /phpBB/includes | |
| parent | f77a6eaab5485329a3b13922649fb8902e6e397f (diff) | |
| download | forums-6e93fee9d2f5951ff85bf658e3da42e4f6d153ec.tar forums-6e93fee9d2f5951ff85bf658e3da42e4f6d153ec.tar.gz forums-6e93fee9d2f5951ff85bf658e3da42e4f6d153ec.tar.bz2 forums-6e93fee9d2f5951ff85bf658e3da42e4f6d153ec.tar.xz forums-6e93fee9d2f5951ff85bf658e3da42e4f6d153ec.zip | |
[feature/soft-delete] Link to delete_topics module when the topic is deleted
PHPBB3-9567
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 7c3bffe717..e8c5550cb7 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -220,12 +220,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $topic_title = censor_text($row['topic_title']); - // @todo: $topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false; $posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false; - $topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false; + $topic_deleted = $row['topic_visibility'] == ITEM_DELETED; $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&t=' . $row['topic_id'] : ''; - $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&mode=deleted_posts&t=' . $topic_id : $u_mcp_queue; + $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&mode=deleted_topics&t=' . $topic_id : $u_mcp_queue; $topic_row = array( 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', |