X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fdeferred%2FSearchUpdate.php;h=62c8b00f39d3845007af7d9aa4844064b424e716;hb=fd9559cb4da5582565eba6216e828efb2cde8db8;hp=f6c80f44dc9a5fdc2c3181348b61b87178d0542a;hpb=18a57bf80585c5ff6a5ee7d41cedb871740cccb4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/SearchUpdate.php b/includes/deferred/SearchUpdate.php
index f6c80f44dc..62c8b00f39 100644
--- a/includes/deferred/SearchUpdate.php
+++ b/includes/deferred/SearchUpdate.php
@@ -23,6 +23,8 @@
  * @ingroup Search
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Database independant search index updater
  *
@@ -38,6 +40,9 @@ class SearchUpdate implements DeferrableUpdate {
 	/** @var Content|bool Content of the page (not text) */
 	private $content;
 
+	/** @var WikiPage **/
+	private $page;
+
 	/**
 	 * Constructor
 	 *
@@ -72,23 +77,22 @@ class SearchUpdate implements DeferrableUpdate {
 	 * Perform actual update for the entry
 	 */
 	public function doUpdate() {
-		global $wgDisableSearchUpdate;
+		$config = MediaWikiServices::getInstance()->getSearchEngineConfig();
 
-		if ( $wgDisableSearchUpdate || !$this->id ) {
+		if ( $config->getConfig()->get( 'DisableSearchUpdate' ) || !$this->id ) {
 			return;
 		}
 
-		$page = WikiPage::newFromID( $this->id, WikiPage::READ_LATEST );
-
-		foreach ( SearchEngine::getSearchTypes() as $type ) {
-			$search = SearchEngine::create( $type );
+		$seFactory = MediaWikiServices::getInstance()->getSearchEngineFactory();
+		foreach ( $config->getSearchTypes() as $type ) {
+			$search = $seFactory->create( $type );
 			if ( !$search->supports( 'search-update' ) ) {
 				continue;
 			}
 
 			$normalTitle = $this->getNormalizedTitle( $search );
 
-			if ( $page === null ) {
+			if ( $this->getLatestPage() === null ) {
 				$search->delete( $this->id, $normalTitle );
 				continue;
 			} elseif ( $this->content === false ) {
@@ -98,7 +102,7 @@ class SearchUpdate implements DeferrableUpdate {
 
 			$text = $search->getTextFromContent( $this->title, $this->content );
 			if ( !$search->textAlreadyUpdatedForIndex() ) {
-				$text = self::updateText( $text );
+				$text = $this->updateText( $text, $search );
 			}
 
 			# Perform the actual update
@@ -112,14 +116,16 @@ class SearchUpdate implements DeferrableUpdate {
 	 * If you're using a real search engine, you'll probably want to override
 	 * this behavior and do something nicer with the original wikitext.
 	 * @param string $text
+	 * @param SearchEngine $se Search engine
 	 * @return string
 	 */
-	public static function updateText( $text ) {
+	public function updateText( $text, SearchEngine $se = null ) {
 		global $wgContLang;
 
 		# Language-specific strip/conversion
 		$text = $wgContLang->normalizeForSearch( $text );
-		$lc = SearchEngine::legalSearchChars() . '&#;';
+		$se = $se ?: MediaWikiServices::getInstance()->newSearchEngine();
+		$lc = $se->legalSearchChars() . '&#;';
 
 		$text = preg_replace( "/<\\/?\\s*[A-Za-z][^>]*?>/",
 			' ', $wgContLang->lc( " " . $text . " " ) ); # Strip HTML markup
@@ -172,6 +178,23 @@ class SearchUpdate implements DeferrableUpdate {
 		return $text;
 	}
 
+	/**
+	 * Get WikiPage for the SearchUpdate $id using WikiPage::READ_LATEST
+	 * and ensure using the same WikiPage object if there are multiple
+	 * SearchEngine types.
+	 *
+	 * Returns null if a page has been deleted or is not found.
+	 *
+	 * @return WikiPage|null
+	 */
+	private function getLatestPage() {
+		if ( !isset( $this->page ) ) {
+			$this->page = WikiPage::newFromID( $this->id, WikiPage::READ_LATEST );
+		}
+
+		return $this->page;
+	}
+
 	/**
 	 * Get a normalized string representation of a title suitable for
 	 * including in a search index