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/search.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/search.php')
| -rw-r--r-- | phpBB/search.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index f89f8ce65b..c065b92fb5 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -869,8 +869,9 @@ if ($keywords || $author || $author_id || $search_id || $submit) $topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED && $auth->acl_get('m_approve', $forum_id)) ? true : false; $posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $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) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$result_topic_id", true, $user->session_id) : ''; + $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&mode=deleted_topics&t=$result_topic_id", true, $user->session_id) : ''; $row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['topic_title']); @@ -906,7 +907,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false, 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, - 'S_TOPIC_DELETED' => $topic_deleted, + 'S_TOPIC_DELETED' => $topic_deleted, 'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), |