X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=blobdiff_plain;f=includes%2Fsearch%2FSearchEngine.php;h=4473bb2927b4d2ffbccacd9257124e40f6b3abc1;hb=54c56da85a33ce18582b7b6023f9e93181334a34;hp=0bcb07a5a67fb759e5665bd685a07e21a274153c;hpb=24dc5218b18bfa065a101057523f39a9c046d046;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 0bcb07a5a6..4473bb2927 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -72,6 +72,21 @@ abstract class SearchEngine {
 		return null;
 	}
 
+	/**
+	 * Perform a title search in the article archive.
+	 * NOTE: these results still should be filtered by
+	 * matching against PageArchive, permissions checks etc
+	 * The results returned by this methods are only sugegstions and
+	 * may not end up being shown to the user.
+	 *
+	 * @param string $term Raw search term
+	 * @return Status<Title[]>
+	 * @since 1.29
+	 */
+	function searchArchiveTitle( $term ) {
+		return Status::newGood( [] );
+	}
+
 	/**
 	 * Perform a title-only search query and return a result set.
 	 * If title searches are not supported or disabled, return null.
@@ -109,6 +124,20 @@ abstract class SearchEngine {
 		$this->features[$feature] = $data;
 	}
 
+	/**
+	 * Way to retrieve custom data set by setFeatureData
+	 * or by the engine itself.
+	 * @since 1.29
+	 * @param string $feature feature name
+	 * @return mixed the feature value or null if unset
+	 */
+	public function getFeatureData( $feature ) {
+		if ( isset ( $this->features[$feature] ) ) {
+			return $this->features[$feature];
+		}
+		return null;
+	}
+
 	/**
 	 * When overridden in derived class, performs database-specific conversions
 	 * on text to be used for searching or updating search index.
@@ -426,8 +455,8 @@ abstract class SearchEngine {
 			$title = Title::newFromText( $search . 'Dummy' );
 			if ( $title && $title->getText() == 'Dummy'
 					&& $title->getNamespace() != NS_MAIN
-					&& !$title->isExternal() )
-			{
+					&& !$title->isExternal()
+			) {
 				$ns = [ $title->getNamespace() ];
 				$search = '';
 			} else {
@@ -706,8 +735,21 @@ abstract class SearchEngine {
 	public function getSearchIndexFields() {
 		$models = ContentHandler::getContentModels();
 		$fields = [];
+		$seenHandlers = new SplObjectStorage();
 		foreach ( $models as $model ) {
-			$handler = ContentHandler::getForModelID( $model );
+			try {
+				$handler = ContentHandler::getForModelID( $model );
+			}
+			catch ( MWUnknownContentModelException $e ) {
+				// If we can find no handler, ignore it
+				continue;
+			}
+			// Several models can have the same handler, so avoid processing it repeatedly
+			if ( $seenHandlers->contains( $handler ) ) {
+				// We already did this one
+				continue;
+			}
+			$seenHandlers->attach( $handler );
 			$handlerFields = $handler->getFieldsForSearchIndex( $this );
 			foreach ( $handlerFields as $fieldName => $fieldData ) {
 				if ( empty( $fields[$fieldName] ) ) {