From a6e8b13531d8688aeaeb84412bd3a223c6c04174 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 3 Sep 2012 12:18:23 +0200 Subject: [PATCH] Drop support for 'options' in OutputPage::wrapWikiMsg() It was not used[1] and complicated migration to Message class. [1] Checked uses in 100 extensions, including most Wikimedia, twn and SMW extensions. Change-Id: Id2ac68ef79e98272d02117165e2f04034f209fb3 --- RELEASE-NOTES-1.20 | 2 ++ includes/OutputPage.php | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index 0b48b728c2..ab374fd24f 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -306,6 +306,8 @@ changes to languages because of Bugzilla reports. * Deprecated DatabaseBase functions newFromParams(), newFromType(), set(), quote_ident(), and escapeLike() were removed. * Use of __DIR__ instead of dirname( __FILE__ ). +* OutputPage::wrapWikiMsg() no longer supports the 'options' parameter. It was + not used and complicated migration to Message class. == Compatibility == diff --git a/includes/OutputPage.php b/includes/OutputPage.php index bc9eaa9a0c..351c6fac2a 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3537,9 +3537,6 @@ $templates * message names, or arrays, in which case the first element is the message name, * and subsequent elements are the parameters to that message. * - * The special named parameter 'options' in a message specification array is passed - * through to the $options parameter of wfMsgExt(). - * * Don't use this for messages that are not in users interface language. * * For example: @@ -3567,12 +3564,16 @@ $templates if ( isset( $args['options'] ) ) { $options = $args['options']; unset( $args['options'] ); + wfDeprecated( + 'Adding "options" to ' . __METHOD__ . ' is no longer supported', + '1.20' + ); } } else { $args = array(); $name = $spec; } - $s = str_replace( '$' . ( $n + 1 ), wfMsgExt( $name, $options, $args ), $s ); + $s = str_replace( '$' . ( $n + 1 ), wfMessage( $name, $args )->plain(), $s ); } $this->addWikiText( $s ); } -- 2.20.1