diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-01 09:08:47 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-01 09:08:47 +0100 |
| commit | 03537e1b947d442fc034a15b055a8b38b6f098e1 (patch) | |
| tree | f3fcd4c660e41923468cf86def89f9c09536ed5a | |
| parent | 57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0 (diff) | |
| parent | af77106a2ff9749eb9e5813d2b80692bab408a5c (diff) | |
| download | forums-03537e1b947d442fc034a15b055a8b38b6f098e1.tar forums-03537e1b947d442fc034a15b055a8b38b6f098e1.tar.gz forums-03537e1b947d442fc034a15b055a8b38b6f098e1.tar.bz2 forums-03537e1b947d442fc034a15b055a8b38b6f098e1.tar.xz forums-03537e1b947d442fc034a15b055a8b38b6f098e1.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/search.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 0d269c5606..e80a89b382 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -922,7 +922,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $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; $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) : ''; + $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) : $u_mcp_queue; $row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['topic_title']); |