From 65b8992f7cdbbc77bf0478d82a96b481f29f02ff Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Sat, 11 May 2019 16:25:26 +0100
Subject: [PATCH] Remove support for calling OutputPage::wrapWikiMsg() with an
 options parameter

Bug: T220656
Change-Id: If9103eb702f3879172d6e860d974603b7b32d6f5
---
 RELEASE-NOTES-1.34      | 2 ++
 includes/OutputPage.php | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index dd8377afba..f3baa52a95 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -227,6 +227,8 @@ because of Phabricator reports.
 * The global function wfBCP47, deprecated in 1.31, has been removed.
 * wfCountDown() function, deprecated in 1.31, has been removed. Use
   \Maintenance::countDown() method instead.
+* OutputPage::wrapWikiMsg() no longer accepts an options parameter. This was
+  deprecated since 1.20.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6c49696a2b..b8cbff1da2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3992,13 +3992,6 @@ class OutputPage extends ContextSource {
 			if ( is_array( $spec ) ) {
 				$args = $spec;
 				$name = array_shift( $args );
-				if ( isset( $args['options'] ) ) {
-					unset( $args['options'] );
-					wfDeprecated(
-						'Adding "options" to ' . __METHOD__ . ' is no longer supported',
-						'1.20'
-					);
-				}
 			} else {
 				$args = [];
 				$name = $spec;
-- 
2.20.1