diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
commit | ca32f08966f1b51fcb19460f0996bb0c4048e6fe (patch) | |
tree | ec04cc15b867bc21eedca904cea9af0254531a11 /includes/search/SearchOracle.php | |
parent | a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c (diff) |
Update to MediaWiki 1.18.0
* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
Diffstat (limited to 'includes/search/SearchOracle.php')
-rw-r--r-- | includes/search/SearchOracle.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php index 15c386ce..85337ca1 100644 --- a/includes/search/SearchOracle.php +++ b/includes/search/SearchOracle.php @@ -123,18 +123,22 @@ class SearchOracle extends SearchEngine { /** * Return a LIMIT clause to limit results on the query. + * + * @param string + * * @return String */ - function queryLimit($sql) { + function queryLimit( $sql ) { return $this->db->limitResult($sql, $this->limit, $this->offset); } /** * Does not do anything for generic search engine * subclasses may define this though + * * @return String */ - function queryRanking($filteredTerm, $fulltext) { + function queryRanking( $filteredTerm, $fulltext ) { return ' ORDER BY score(1)'; } @@ -186,7 +190,7 @@ class SearchOracle extends SearchEngine { $lc = SearchEngine::legalSearchChars(); $this->searchTerms = array(); - # FIXME: This doesn't handle parenthetical expressions. + # @todo FIXME: This doesn't handle parenthetical expressions. $m = array(); $searchon = ''; if (preg_match_all('/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/', @@ -253,9 +257,9 @@ class SearchOracle extends SearchEngine { // ALTER SESSION SET CURRENT_SCHEMA = ... // was used. $dbw->query( "CALL ctx_ddl.sync_index(" . - $dbw->addQuotes( $dbw->getDBname() . '.' . trim( $dbw->tableName( 'si_text_idx' ), '"' ) ) . ")" ); + $dbw->addQuotes( $dbw->getDBname() . '.' . $dbw->tableName( 'si_text_idx', false ) ) . ")" ); $dbw->query( "CALL ctx_ddl.sync_index(" . - $dbw->addQuotes( $dbw->getDBname() . '.' . trim( $dbw->tableName( 'si_title_idx' ), '"' ) ) . ")" ); + $dbw->addQuotes( $dbw->getDBname() . '.' . $dbw->tableName( 'si_title_idx', false ) ) . ")" ); } /** |