X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserOutput.php;h=cc707134b86c943f59493ee0a9652ab20f5a87c1;hb=4435211205508fd72dfc978e1e6575b1edd36050;hp=6260de6bc080635dcd874c7a457b3b04698c9a6a;hpb=7ddab17aac1103fa080b50759ab6ca906caa554e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 6260de6bc0..cc707134b8 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -42,7 +42,7 @@ class ParserOutput extends CacheTime {
 	public $mLanguageLinks;
 
 	/**
-	 * @var array $mCategoriesMap of category names to sort keys
+	 * @var array $mCategories Map of category names to sort keys
 	 */
 	public $mCategories;
 
@@ -120,11 +120,6 @@ class ParserOutput extends CacheTime {
 	 */
 	public $mModules = [];
 
-	/**
-	 * @var array $mModuleScripts Modules of which only the JS will be loaded by ResourceLoader.
-	 */
-	public $mModuleScripts = [];
-
 	/**
 	 * @var array $mModuleStyles Modules of which only the CSSS will be loaded by ResourceLoader.
 	 */
@@ -476,14 +471,6 @@ class ParserOutput extends CacheTime {
 		return $this->mSections;
 	}
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 */
-	public function getEditSectionTokens() {
-		wfDeprecated( __METHOD__, '1.31' );
-		return true;
-	}
-
 	public function &getLinks() {
 		return $this->mLinks;
 	}
@@ -523,10 +510,6 @@ class ParserOutput extends CacheTime {
 		return $this->mModules;
 	}
 
-	public function getModuleScripts() {
-		return $this->mModuleScripts;
-	}
-
 	public function getModuleStyles() {
 		return $this->mModuleStyles;
 	}
@@ -570,14 +553,6 @@ class ParserOutput extends CacheTime {
 		return $this->mLimitReportJSData;
 	}
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 */
-	public function getTOCEnabled() {
-		wfDeprecated( __METHOD__, '1.31' );
-		return true;
-	}
-
 	public function getEnableOOUI() {
 		return $this->mEnableOOUI;
 	}
@@ -602,14 +577,6 @@ class ParserOutput extends CacheTime {
 		return wfSetVar( $this->mSections, $toc );
 	}
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 */
-	public function setEditSectionTokens( $t ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		return true;
-	}
-
 	public function setIndexPolicy( $policy ) {
 		return wfSetVar( $this->mIndexPolicy, $policy );
 	}
@@ -622,14 +589,6 @@ class ParserOutput extends CacheTime {
 		return wfSetVar( $this->mTimestamp, $timestamp );
 	}
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 */
-	public function setTOCEnabled( $flag ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		return true;
-	}
-
 	public function addCategory( $c, $sort ) {
 		$this->mCategories[$c] = $sort;
 	}
@@ -817,14 +776,6 @@ class ParserOutput extends CacheTime {
 		$this->mModules = array_merge( $this->mModules, (array)$modules );
 	}
 
-	/**
-	 * @deprecated since 1.31 Use addModules() instead.
-	 * @see OutputPage::addModuleScripts
-	 */
-	public function addModuleScripts( $modules ) {
-		$this->mModuleScripts = array_merge( $this->mModuleScripts, (array)$modules );
-	}
-
 	/**
 	 * @see OutputPage::addModuleStyles
 	 */
@@ -857,7 +808,6 @@ class ParserOutput extends CacheTime {
 	 */
 	public function addOutputPageMetadata( OutputPage $out ) {
 		$this->addModules( $out->getModules() );
-		$this->addModuleScripts( $out->getModuleScripts() );
 		$this->addModuleStyles( $out->getModuleStyles() );
 		$this->addJsConfigVars( $out->getJsConfigVars() );
 
@@ -1338,7 +1288,6 @@ class ParserOutput extends CacheTime {
 		// HTML and HTTP
 		$this->mHeadItems = self::mergeMixedList( $this->mHeadItems, $source->getHeadItems() );
 		$this->mModules = self::mergeList( $this->mModules, $source->getModules() );
-		$this->mModuleScripts = self::mergeList( $this->mModuleScripts, $source->getModuleScripts() );
 		$this->mModuleStyles = self::mergeList( $this->mModuleStyles, $source->getModuleStyles() );
 		$this->mJsConfigVars = self::mergeMap( $this->mJsConfigVars, $source->getJsConfigVars() );
 		$this->mMaxAdaptiveExpiry = min( $this->mMaxAdaptiveExpiry, $source->mMaxAdaptiveExpiry );
@@ -1359,7 +1308,7 @@ class ParserOutput extends CacheTime {
 
 		// TODO: we'll have to be smarter about this!
 		$this->mSections = array_merge( $this->mSections, $source->getSections() );
-		$this->mTOCHTML = $this->mTOCHTML . $source->mTOCHTML;
+		$this->mTOCHTML .= $source->mTOCHTML;
 
 		// XXX: we don't want to concatenate title text, so first write wins.
 		// We should use the first *modified* title text, but we don't have the original to check.