From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 3 Sep 2012 10:18:23 +0000 (+0200)
Subject: Drop support for 'options' in OutputPage::wrapWikiMsg()
X-Git-Tag: 1.31.0-rc.0~22482
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=a6e8b13;p=lhc%2Fweb%2Fwiklou.git

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
---

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 );
 	}