Merge "Revert "Fix testsuites for LogFormatter""

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index dd8377a..f3baa52 100644 (file)
--- 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 6c49696..b8cbff1 100644 (file)
--- 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;