From 19d76f76dcd19e2bd44fbe7a384533bae4cb1538 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 1 Jul 2012 12:45:18 +0530
Subject: [feature/postgresql-fulltext-search] remove phrase search code
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.
PHPBB3-9730
---
phpBB/search.php | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'phpBB/search.php')
diff --git a/phpBB/search.php b/phpBB/search.php
index 2b463aec9c..0d13644b02 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -596,6 +596,13 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$u_search .= ($search_fields != 'all') ? '&sf=' . $search_fields : '';
$u_search .= ($return_chars != 300) ? '&ch=' . $return_chars : '';
+ //check if search backend supports phrase search or not
+ $l_phrase_search_disabled = '';
+ if (strpos(html_entity_decode($keywords), '"') !== false && isset($search->phrase_search))
+ {
+ $l_phrase_search_disabled = $search->phrase_search ? false : true;
+ }
+
$template->assign_vars(array(
'SEARCH_TITLE' => $l_search_title,
'SEARCH_MATCHES' => $l_search_matches,
@@ -603,6 +610,9 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'IGNORED_WORDS' => (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '',
'PAGINATION' => generate_pagination($u_search, $total_match_count, $per_page, $start),
'PAGE_NUMBER' => on_page($total_match_count, $per_page, $start),
+
+ 'PHRASE_SEARCH_DISABLED' => $l_phrase_search_disabled,
+
'TOTAL_MATCHES' => $total_match_count,
'SEARCH_IN_RESULTS' => ($search_id) ? false : true,
--
cgit v1.2.1