diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
| commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
| tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/search/SearchMySQL.php | |
| parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) | |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/search/SearchMySQL.php')
| -rw-r--r-- | includes/search/SearchMySQL.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php index 485088cb..246f1155 100644 --- a/includes/search/SearchMySQL.php +++ b/includes/search/SearchMySQL.php @@ -54,9 +54,9 @@ class SearchMySQL extends SearchDatabase { if ( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/', $filteredText, $m, PREG_SET_ORDER ) ) { foreach ( $m as $bits ) { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); list( /* all */, $modifier, $term, $nonQuoted, $wildcard ) = $bits; - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $nonQuoted != '' ) { $term = $nonQuoted; @@ -439,7 +439,7 @@ class SearchMySQL extends SearchDatabase { $sql = "SHOW GLOBAL VARIABLES LIKE 'ft\\_min\\_word\\_len'"; $dbr = wfGetDB( DB_SLAVE ); - $result = $dbr->query( $sql ); + $result = $dbr->query( $sql, __METHOD__ ); $row = $result->fetchObject(); $result->free(); |