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 "Add Oracle version of update-keys.sql"
[lhc/web/wiklou.git]
/
includes
/
search
/
SearchMssql.php
diff --git
a/includes/search/SearchMssql.php
b/includes/search/SearchMssql.php
index
0d1663f
..
0d7970d
100644
(file)
--- a/
includes/search/SearchMssql.php
+++ b/
includes/search/SearchMssql.php
@@
-34,10
+34,7
@@
class SearchMssql extends SearchDatabase {
* @access public
*/
function searchText( $term ) {
* @access public
*/
function searchText( $term ) {
- $resultSet = $this->db->resultObject(
- $this->db->query( $this->getQuery( $this->filter( $term ), true ) )
- );
-
+ $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), true ) );
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
@@
-49,10
+46,7
@@
class SearchMssql extends SearchDatabase {
* @access public
*/
function searchTitle( $term ) {
* @access public
*/
function searchTitle( $term ) {
- $resultSet = $this->db->resultObject(
- $this->db->query( $this->getQuery( $this->filter( $term ), false ) )
- );
-
+ $resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), false ) );
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
return new SqlSearchResultSet( $resultSet, $this->searchTerms );
}
@@
-85,6
+79,8
@@
class SearchMssql extends SearchDatabase {
* Does not do anything for generic search engine
* subclasses may define this though
*
* Does not do anything for generic search engine
* subclasses may define this though
*
+ * @param string $filteredTerm
+ * @param bool $fulltext
* @return string
*/
function queryRanking( $filteredTerm, $fulltext ) {
* @return string
*/
function queryRanking( $filteredTerm, $fulltext ) {
@@
-134,6
+130,8
@@
class SearchMssql extends SearchDatabase {
}
/** @todo document
}
/** @todo document
+ * @param string $filteredText
+ * @param bool $fulltext
* @return string
*/
function parseQuery( $filteredText, $fulltext ) {
* @return string
*/
function parseQuery( $filteredText, $fulltext ) {