Merge "Add Russian grammar forms to support Wikiversity"

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

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 4253193..7e6e8e6 100644 (file)
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -406,17 +406,6 @@ abstract class SearchEngine {
                // no-op
        }
 
-       /**
-        * Get OpenSearch suggestion template
-        *
-        * @deprecated since 1.25
-        * @return string
-        */
-       public static function getOpenSearchTemplate() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return ApiOpenSearch::getOpenSearchTemplate( 'application/x-suggestions+json' );
-       }
-
        /**
         * Get the raw text for updating the index from a content object
         * Nicer search backends could possibly do something cooler than
@@ -543,7 +532,7 @@ abstract class SearchEngine {
                                $this->setLimitOffset( $fallbackLimit );
                                $fallbackSearchResult = $this->completionSearch( $fbs );
                                $results->appendAll( $fallbackSearchResult );
-                               $fallbackLimit -= count( $fallbackSearchResult );
+                               $fallbackLimit -= $fallbackSearchResult->getSize();
                                if ( $fallbackLimit <= 0 ) {
                                        break;
                                }