diff options
| -rw-r--r-- | includes/parser/Sanitizer.php | 14 | ||||
| -rw-r--r-- | tests/phpunit/includes/parser/SanitizerTest.php | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php index 0d26d33e4574..53e04eaac83d 100644 --- a/includes/parser/Sanitizer.php +++ b/includes/parser/Sanitizer.php @@ -459,7 +459,7 @@ class Sanitizer { || $attribute === 'aria-labelledby' || $attribute === 'aria-owns' ) { - $value = self::escapeIdReferenceList( $value ); + $value = self::escapeIdReferenceListInternal( $value ); } // RDFa and microdata properties allow URLs, URIs and/or CURIs. @@ -935,6 +935,18 @@ class Sanitizer { * @return string */ public static function escapeIdReferenceList( $referenceString ) { + wfDeprecated( __METHOD__, '1.36' ); + return self::escapeIdReferenceListInternal( $referenceString ); + } + + /** + * Given a string containing a space delimited list of ids, escape each id + * to match ids escaped by the escapeIdForAttribute() function. + * + * @param string $referenceString Space delimited list of ids + * @return string + */ + private static function escapeIdReferenceListInternal( $referenceString ) { # Explode the space delimited list string into an array of tokens $references = preg_split( '/\s+/', "{$referenceString}", -1, PREG_SPLIT_NO_EMPTY ); diff --git a/tests/phpunit/includes/parser/SanitizerTest.php b/tests/phpunit/includes/parser/SanitizerTest.php index b83818f1fdd6..fd949c0fa0e0 100644 --- a/tests/phpunit/includes/parser/SanitizerTest.php +++ b/tests/phpunit/includes/parser/SanitizerTest.php @@ -273,6 +273,7 @@ class SanitizerTest extends MediaWikiIntegrationTestCase { * @covers Sanitizer::escapeIdReferenceList */ public function testEscapeIdReferenceList( $referenceList, $id1, $id2 ) { + $this->hideDeprecated( 'Sanitizer::escapeIdReferenceList' ); $this->assertEquals( Sanitizer::escapeIdReferenceList( $referenceList ), Sanitizer::escapeIdForAttribute( $id1 ) |