From bc57ba098e5f908f1cf35acfb6363603fbeaf3dc Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 15 Sep 2008 11:11:39 +0000 Subject: [PATCH] - Added missing terms parameter to search pagination. #34085 - Do not use the topics posted table when performing an egosearch. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8843 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/search.php | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c72d16feea..61b4caf1b0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -121,6 +121,8 @@
  • [Fix] Do not decrease topics counter when deleting shadow topics. (Bug #26495)
  • [Fix] Send localised disapproval reasons in the recipients local language. (Bug #31645)
  • [Fix] Language typos/fixes. (Bug #27625, #30755)
    • +
  • [Fix] Added missing terms parameter to search pagination. (Bug #34085)
    • +
  • [Change] Do not use the topics posted table when performing an egosearch.
    • diff --git a/phpBB/search.php b/phpBB/search.php index 6af534b0b0..d987c74fbd 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -476,6 +476,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results); $u_search .= ($search_id) ? '&search_id=' . $search_id : ''; $u_search .= ($u_hilit) ? '&keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : ''; + $u_search .= ($search_terms != 'all') ? '&terms=' . $search_terms : ''; $u_search .= ($topic_id) ? '&t=' . $topic_id : ''; $u_search .= ($author) ? '&author=' . urlencode(htmlspecialchars_decode($author)) : ''; $u_search .= ($author_id) ? '&author_id=' . $author_id : ''; @@ -542,7 +543,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($user->data['is_registered']) { - if ($config['load_db_track']) + if ($config['load_db_track'] && $author_id !== $user->data['user_id']) { $sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tp.topic_id)'; @@ -772,6 +773,11 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($show_results == 'topics') { + if ($config['load_db_track'] && $author_id === $user->data['user_id']) + { + $row['topic_posted'] = 1; + } + $folder_img = $folder_alt = $topic_type = ''; topic_status($row, $replies, (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false, $folder_img, $folder_alt, $topic_type);