Linker::link: Drop support for string query param, deprecated in 1.20

Change-Id: I910cead2c32a3525772ee0640c8ed3b90ad40a84

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 5c0b57e..87068d8 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -230,6 +230,8 @@ because of Phabricator reports.
 * OutputPage::wrapWikiMsg() no longer accepts an options parameter. This was
   deprecated since 1.20.
 * Skin::outputPage() no longer accepts a context. This was deprecated in 1.20.
 * OutputPage::wrapWikiMsg() no longer accepts an options parameter. This was
   deprecated since 1.20.
 * Skin::outputPage() no longer accepts a context. This was deprecated in 1.20.

+* Linker::link() no longer accepts a string for the query array, as was
+  deprecated in 1.20.

 * …
 
 === Deprecations in 1.34 ===
 * …
 
 === Deprecations in 1.34 ===

diff --git a/includes/Linker.php b/includes/Linker.php
index 39f4394..1980154 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -89,12 +89,6 @@ class Linker {
                        return "<!-- ERROR -->$html";
                }
 
                        return "<!-- ERROR -->$html";
                }
 

-               if ( is_string( $query ) ) {
-                       // some functions withing core using this still hand over query strings
-                       wfDeprecated( __METHOD__ . ' with parameter $query as string (should be array)', '1.20' );
-                       $query = wfCgiToArray( $query );
-               }
-

                $services = MediaWikiServices::getInstance();
                $options = (array)$options;
                if ( $options ) {
                $services = MediaWikiServices::getInstance();
                $options = (array)$options;
                if ( $options ) {