From adf90edb3335aac88f68b792aea492550a73c07b Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Thu, 21 Feb 2019 20:12:22 -0800 Subject: [PATCH] Sanitizer: remove deprecated parameter to escapeIdReferenceList() Change-Id: Iacd5796718c1d64e7290cfd9669c99d8f9e85dc5 --- RELEASE-NOTES-1.33 | 2 ++ includes/parser/Sanitizer.php | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index dc100ef96f..d9175a002a 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -262,6 +262,8 @@ because of Phabricator reports. * The ChangeList::insertArticleLink() method, that was deprecated in 1.27, has been removed. * MessageBlobStore::__construct() now requires its $rl parameter. +* Second parameter to Sanitizer::escapeIdReferenceList() (deprecated in 1.31) + has been removed. === Deprecations in 1.33 === * The configuration option $wgUseESI has been deprecated, and is expected diff --git a/includes/parser/Sanitizer.php b/includes/parser/Sanitizer.php index f8c3bc2c72..0aa58c1615 100644 --- a/includes/parser/Sanitizer.php +++ b/includes/parser/Sanitizer.php @@ -1375,20 +1375,14 @@ class Sanitizer { /** * Given a string containing a space delimited list of ids, escape each id - * to match ids escaped by the escapeId() function. - * - * @todo remove $options completely in 1.32 + * to match ids escaped by the escapeIdForAttribute() function. * * @since 1.27 * * @param string $referenceString Space delimited list of ids - * @param string|array $options Deprecated and does nothing. * @return string */ - static function escapeIdReferenceList( $referenceString, $options = [] ) { - if ( $options ) { - wfDeprecated( __METHOD__ . ' with $options', '1.31' ); - } + public static function escapeIdReferenceList( $referenceString ) { # Explode the space delimited list string into an array of tokens $references = preg_split( '/\s+/', "{$referenceString}", -1, PREG_SPLIT_NO_EMPTY ); -- 2.20.1