dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Update set of files cleaned up after parserTests"
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchOracle.php
diff --git
a/includes/search/SearchOracle.php
b/includes/search/SearchOracle.php
index
cea17d2
..
e14de2c
100644
(file)
--- a/
includes/search/SearchOracle.php
+++ b/
includes/search/SearchOracle.php
@@
-3,7
+3,7
@@
* Oracle search engine
*
* Copyright © 2004 Brion Vibber <brion@pobox.com>
* Oracle search engine
*
* Copyright © 2004 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * http
s
://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-89,18
+89,6
@@
class SearchOracle extends SearchDatabase {
return new MySQLSearchResultSet( $resultSet, $this->searchTerms );
}
return new MySQLSearchResultSet( $resultSet, $this->searchTerms );
}
- /**
- * Return a partial WHERE clause to exclude redirects, if so set
- * @return String
- */
- function queryRedirect() {
- if ( $this->showRedirects ) {
- return '';
- } else {
- return 'AND page_is_redirect=0';
- }
- }
-
/**
* Return a partial WHERE clause to limit the search to the given namespaces
* @return String
/**
* Return a partial WHERE clause to limit the search to the given namespaces
* @return String
@@
-147,7
+135,6
@@
class SearchOracle extends SearchDatabase {
*/
function getQuery( $filteredTerm, $fulltext ) {
return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
*/
function getQuery( $filteredTerm, $fulltext ) {
return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
- $this->queryRedirect() . ' ' .
$this->queryNamespaces() . ' ' .
$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
}
$this->queryNamespaces() . ' ' .
$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
}
@@
-230,6
+217,7
@@
class SearchOracle extends SearchDatabase {
$t = preg_replace( '/([-&|])/', '\\\\$1', $t );
return $t;
}
$t = preg_replace( '/([-&|])/', '\\\\$1', $t );
return $t;
}
+
/**
* Create or update the search index record for the given page.
* Title and text should be pre-processed.
/**
* Create or update the search index record for the given page.
* Title and text should be pre-processed.