X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fsearch%2FSearchEngine.php;h=bfcfb59804c4f5bf222c8a31cb51ffadc4b9c172;hp=3c8fe608b4667328617e1df455b227a69a39acbe;hb=29ef5f88ab95a7df05d5b48cced165bcc2f88b60;hpb=52ba4e60846b7c47d7b460beee82654346c41093

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 3c8fe608b4..bfcfb59804 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -112,11 +112,11 @@ abstract class SearchEngine {
 	 */
 	public function supports( $feature ) {
 		switch ( $feature ) {
-		case 'search-update':
-			return true;
-		case 'title-suffix-filter':
-		default:
-			return false;
+			case 'search-update':
+				return true;
+			case 'title-suffix-filter':
+			default:
+				return false;
 		}
 	}
 
@@ -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
@@ -454,7 +443,9 @@ abstract class SearchEngine {
 		$ns = $this->namespaces;
 		if ( $title && !$title->isExternal() ) {
 			$ns = [ $title->getNamespace() ];
-			$search = $title->getText();
+			if ( $title->getNamespace() !== NS_MAIN ) {
+				$search = substr( $search, strpos( $search, ':' ) + 1 );
+			}
 			if ( $ns[0] == NS_MAIN ) {
 				$ns = $this->namespaces; // no explicit prefix, use default namespaces
 				Hooks::run( 'PrefixSearchExtractNamespace', [ &$ns, &$search ] );
@@ -543,7 +534,7 @@ abstract class SearchEngine {
 				$this->setLimitOffset( $fallbackLimit );
 				$fallbackSearchResult = $this->completionSearch( $fbs );
 				$results->appendAll( $fallbackSearchResult );
-				$fallbackLimit -= count( $fallbackSearchResult );
+				$fallbackLimit -= $fallbackSearchResult->getSize();
 				if ( $fallbackLimit <= 0 ) {
 					break;
 				}