X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=blobdiff_plain;f=includes%2Fparser%2FSanitizer.php;h=b13e59787f201afabe951937dbdd674206e3cd81;hb=369b3fa977a2d5ce07ed14b9b54f30c8803f6b1a;hp=b570a43c061be40425c2bdcd7283186d28524b2a;hpb=1a0474fa7bb681d18151edb38c2da11577d96bd2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php
index b570a43c06..b13e59787f 100644
--- a/includes/parser/Sanitizer.php
+++ b/includes/parser/Sanitizer.php
@@ -515,9 +515,9 @@ class Sanitizer {
 						$badtag = true;
 					} elseif ( $slash ) {
 						# Closing a tag... is it the one we just opened?
-						MediaWiki\suppressWarnings();
+						Wikimedia\suppressWarnings();
 						$ot = array_pop( $tagstack );
-						MediaWiki\restoreWarnings();
+						Wikimedia\restoreWarnings();
 
 						if ( $ot != $t ) {
 							if ( isset( $htmlsingleallowed[$ot] ) ) {
@@ -525,32 +525,32 @@ class Sanitizer {
 								# and see if we find a match below them
 								$optstack = [];
 								array_push( $optstack, $ot );
-								MediaWiki\suppressWarnings();
+								Wikimedia\suppressWarnings();
 								$ot = array_pop( $tagstack );
-								MediaWiki\restoreWarnings();
+								Wikimedia\restoreWarnings();
 								while ( $ot != $t && isset( $htmlsingleallowed[$ot] ) ) {
 									array_push( $optstack, $ot );
-									MediaWiki\suppressWarnings();
+									Wikimedia\suppressWarnings();
 									$ot = array_pop( $tagstack );
-									MediaWiki\restoreWarnings();
+									Wikimedia\restoreWarnings();
 								}
 								if ( $t != $ot ) {
 									# No match. Push the optional elements back again
 									$badtag = true;
-									MediaWiki\suppressWarnings();
+									Wikimedia\suppressWarnings();
 									$ot = array_pop( $optstack );
-									MediaWiki\restoreWarnings();
+									Wikimedia\restoreWarnings();
 									while ( $ot ) {
 										array_push( $tagstack, $ot );
-										MediaWiki\suppressWarnings();
+										Wikimedia\suppressWarnings();
 										$ot = array_pop( $optstack );
-										MediaWiki\restoreWarnings();
+										Wikimedia\restoreWarnings();
 									}
 								}
 							} else {
-								MediaWiki\suppressWarnings();
+								Wikimedia\suppressWarnings();
 								array_push( $tagstack, $ot );
-								MediaWiki\restoreWarnings();
+								Wikimedia\restoreWarnings();
 
 								# <li> can be nested in <ul> or <ol>, skip those cases:
 								if ( !isset( $htmllist[$ot] ) || !isset( $listtags[$t] ) ) {
@@ -1171,7 +1171,9 @@ class Sanitizer {
 		# Stupid hack
 		$encValue = preg_replace_callback(
 			'/((?i)' . wfUrlProtocols() . ')/',
-			[ 'Sanitizer', 'armorLinksCallback' ],
+			function ( $matches ) {
+				return str_replace( ':', '&#58;', $matches[1] );
+			},
 			$encValue );
 		return $encValue;
 	}
@@ -1416,15 +1418,6 @@ class Sanitizer {
 		return $html;
 	}
 
-	/**
-	 * Regex replace callback for armoring links against further processing.
-	 * @param array $matches
-	 * @return string
-	 */
-	private static function armorLinksCallback( $matches ) {
-		return str_replace( ':', '&#58;', $matches[1] );
-	}
-
 	/**
 	 * Return an associative array of attribute names and values from
 	 * a partial tag string. Attribute names are forced to lowercase,
@@ -1549,7 +1542,7 @@ class Sanitizer {
 	static function normalizeCharReferences( $text ) {
 		return preg_replace_callback(
 			self::CHAR_REFS_REGEX,
-			[ 'Sanitizer', 'normalizeCharReferencesCallback' ],
+			[ self::class, 'normalizeCharReferencesCallback' ],
 			$text );
 	}
 
@@ -1649,7 +1642,7 @@ class Sanitizer {
 	public static function decodeCharReferences( $text ) {
 		return preg_replace_callback(
 			self::CHAR_REFS_REGEX,
-			[ 'Sanitizer', 'decodeCharReferencesCallback' ],
+			[ self::class, 'decodeCharReferencesCallback' ],
 			$text );
 	}
 
@@ -1667,7 +1660,7 @@ class Sanitizer {
 		global $wgContLang;
 		$text = preg_replace_callback(
 			self::CHAR_REFS_REGEX,
-			[ 'Sanitizer', 'decodeCharReferencesCallback' ],
+			[ self::class, 'decodeCharReferencesCallback' ],
 			$text,
 			-1, //limit
 			$count