Merge "Document SearchDatabase::doSearchTextInDB to return null"

[lhc/web/wiklou.git] / includes / search / SearchOracle.php

diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index a5d351b..d0869bc 100644 (file)
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -64,11 +64,11 @@ class SearchOracle extends SearchDatabase {
         * Perform a full text search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTextInDB( $term ) {
                if ( $term == '' ) {
-                       return new SqlSearchResultSet( false, '' );
+                       return null;
                }
 
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );
@@ -80,11 +80,11 @@ class SearchOracle extends SearchDatabase {
         * Perform a title-only search query and return a result set.
         *
         * @param string $term Raw search term
-        * @return SqlSearchResultSet
+        * @return SqlSearchResultSet|null
         */
        protected function doSearchTitleInDB( $term ) {
                if ( $term == '' ) {
-                       return new SqlSearchResultSet( false, '' );
+                       return null;
                }
 
                $dbr = $this->lb->getConnectionRef( DB_REPLICA );
@@ -240,7 +240,7 @@ class SearchOracle extends SearchDatabase {
         * @param string $text
         */
        function update( $id, $title, $text ) {
-               $dbw = $this->lb->getConnection( DB_MASTER );
+               $dbw = $this->lb->getMaintenanceConnectionRef( DB_MASTER );
                $dbw->replace( 'searchindex',
                        [ 'si_page' ],
                        [