X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fparser%2FParserOutput.php;h=8f0a1d7cc9fdee8ce6b7e25df035ca71beab29ad;hb=bd2f9e35da01c782751884366f207e6e166099fb;hp=e2efaff40f706a2b5d92f3f746d1a4368af75a69;hpb=92571d7c1a9c25604382f9c395e487e44cc442d5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index e2efaff40f..8f0a1d7cc9 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -21,6 +21,7 @@
  * @file
  * @ingroup Parser
  */
+
 class ParserOutput extends CacheTime {
 	/**
 	 * Feature flags to indicate to extensions that MediaWiki core supports and
@@ -150,12 +151,6 @@ class ParserOutput extends CacheTime {
 	 */
 	public $mSections = [];
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 * @var bool $mEditSectionTokens prefix/suffix markers if edit sections were output as tokens.
-	 */
-	public $mEditSectionTokens = true;
-
 	/**
 	 * @var array $mProperties Name/value pairs to be cached in the DB.
 	 */
@@ -171,12 +166,6 @@ class ParserOutput extends CacheTime {
 	 */
 	public $mTimestamp;
 
-	/**
-	 * @deprecated since 1.31 Use getText() options.
-	 * @var bool $mTOCEnabled Whether TOC should be shown, can't override __NOTOC__.
-	 */
-	public $mTOCEnabled = true;
-
 	/**
 	 * @var bool $mEnableOOUI Whether OOUI should be enabled.
 	 */
@@ -270,26 +259,20 @@ class ParserOutput extends CacheTime {
 	 *     section edit link tokens are present in the HTML. Default is true,
 	 *     but might be statefully overridden.
 	 *  - unwrap: (bool) Remove a wrapping mw-parser-output div. Default is false.
+	 *  - deduplicateStyles: (bool) When true, which is the default, `<style>`
+	 *    tags with the `data-mw-deduplicate` attribute set are deduplicated by
+	 *    value of the attribute: all but the first will be replaced by `<link
+	 *    rel="mw-deduplicated-inline-style" href="mw-data:..."/>` tags, where
+	 *    the scheme-specific-part of the href is the (percent-encoded) value
+	 *    of the `data-mw-deduplicate` attribute.
 	 * @return string HTML
 	 */
 	public function getText( $options = [] ) {
-		if ( !array_key_exists( 'allowTOC', $options ) && empty( $this->mTOCEnabled ) ) {
-			wfDeprecated( 'ParserOutput stateful allowTOC', '1.31' );
-		}
-
-		//  Note that while $this->mEditSectionTokens formerly defaulted to false,
-		//  ParserOptions->getEditSection() defaults to true and Parser copies
-		//  that to us so true makes more sense as the stateless default.
-		if ( !array_key_exists( 'enableSectionEditLinks', $options ) && !$this->mEditSectionTokens ) {
-			wfDeprecated( 'ParserOutput stateful enableSectionEditLinks', '1.31' );
-		}
-
 		$options += [
-			// empty() here because old cached versions might lack the field somehow.
-			// In that situation, the historical behavior (possibly buggy) is to remove the TOC.
-			'allowTOC' => !empty( $this->mTOCEnabled ),
-			'enableSectionEditLinks' => $this->mEditSectionTokens,
+			'allowTOC' => true,
+			'enableSectionEditLinks' => true,
 			'unwrap' => false,
+			'deduplicateStyles' => true,
 		];
 		$text = $this->mText;
 
@@ -301,10 +284,16 @@ class ParserOutput extends CacheTime {
 			] );
 			$startLen = strlen( $start );
 			$end = Html::closeElement( 'div' );
+			$endPos = strrpos( $text, $end );
 			$endLen = strlen( $end );
 
-			if ( substr( $text, 0, $startLen ) === $start && substr( $text, -$endLen ) === $end ) {
-				$text = substr( $text, $startLen, -$endLen );
+			if ( substr( $text, 0, $startLen ) === $start && $endPos !== false
+				// if the closing div is followed by real content, bail out of unwrapping
+				&& preg_match( '/^(?>\s*<!--.*?-->)*\s*$/s', substr( $text, $endPos + $endLen ) )
+			) {
+				$text = substr( $text, $startLen );
+				$text = substr( $text, 0, $endPos - $startLen )
+					. substr( $text, $endPos - $startLen + $endLen );
 			}
 		}
 
@@ -344,6 +333,35 @@ class ParserOutput extends CacheTime {
 			);
 		}
 
+		if ( $options['deduplicateStyles'] ) {
+			$seen = [];
+			$text = preg_replace_callback(
+				'#<style\s+([^>]*data-mw-deduplicate\s*=[^>]*)>.*?</style>#s',
+				function ( $m ) use ( &$seen ) {
+					$attr = Sanitizer::decodeTagAttributes( $m[1] );
+					if ( !isset( $attr['data-mw-deduplicate'] ) ) {
+						return $m[0];
+					}
+
+					$key = $attr['data-mw-deduplicate'];
+					if ( !isset( $seen[$key] ) ) {
+						$seen[$key] = true;
+						return $m[0];
+					}
+
+					// We were going to use an empty <style> here, but there
+					// was concern that would be too much overhead for browsers.
+					// So let's hope a <link> with a non-standard rel and href isn't
+					// going to be misinterpreted or mangled by any subsequent processing.
+					return Html::element( 'link', [
+						'rel' => 'mw-deduplicated-inline-style',
+						'href' => "mw-data:" . wfUrlencode( $key ),
+					] );
+				},
+				$text
+			);
+		}
+
 		return $text;
 	}
 
@@ -399,7 +417,8 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.31 Use getText() options.
 	 */
 	public function getEditSectionTokens() {
-		return $this->mEditSectionTokens;
+		wfDeprecated( __METHOD__, '1.31' );
+		return true;
 	}
 
 	public function &getLinks() {
@@ -489,7 +508,8 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.31 Use getText() options.
 	 */
 	public function getTOCEnabled() {
-		return $this->mTOCEnabled;
+		wfDeprecated( __METHOD__, '1.31' );
+		return true;
 	}
 
 	public function getEnableOOUI() {
@@ -520,7 +540,8 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.31 Use getText() options.
 	 */
 	public function setEditSectionTokens( $t ) {
-		return wfSetVar( $this->mEditSectionTokens, $t );
+		wfDeprecated( __METHOD__, '1.31' );
+		return true;
 	}
 
 	public function setIndexPolicy( $policy ) {
@@ -539,7 +560,8 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.31 Use getText() options.
 	 */
 	public function setTOCEnabled( $flag ) {
-		return wfSetVar( $this->mTOCEnabled, $flag );
+		wfDeprecated( __METHOD__, '1.31' );
+		return true;
 	}
 
 	public function addCategory( $c, $sort ) {