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/viewforum.php | |
| 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/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 5c5d37b419..f675b5e310 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -688,11 +688,10 @@ if (sizeof($topic_list)) $topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED && $auth->acl_get('m_approve', $row['forum_id'])); $posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])); - $topic_deleted = ($row['topic_visibility'] == ITEM_DELETED); - $posts_deleted = ($row['topic_visibility'] == ITEM_DELETED && $row['topic_posts_softdeleted'] && $auth->acl_get('m_approve', $row['forum_id'])); - //@todo: this is still some kind of wrong! + $topic_deleted = $row['topic_visibility'] == ITEM_DELETED; + $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : ''; - $u_mcp_queue = (!$u_mcp_queue && ($topic_deleted || $posts_deleted)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=deleted_posts&t=' . $topic_id, true, $user->session_id) : $u_mcp_queue; + $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=deleted_topics&t=' . $topic_id, true, $user->session_id) : $u_mcp_queue; // Send vars to template $topic_row = array( |