Follow-up I47412b67: pass an array of query parameters to Linker::link()

Spotted by Daniel Werner in that change.

Change-Id: I8ded52b8285b2af0f69cc586abe532ea56cc18bb

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6c1ac4b..a9c7d14 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1725,7 +1725,7 @@ class OutputPage extends ContextSource {
        /**
         * Return a Vary: header on which to vary caches. Based on the keys of $mVaryHeader,
         * such as Accept-Encoding or Cookie
-        * 
+        *
         * @return String
         */
        public function getVaryHeader() {
@@ -2351,7 +2351,7 @@ $templates
         * Add a "return to" link pointing to a specified title
         *
         * @param $title Title to link
-        * @param $query String query string
+        * @param $query Array query string parameters
         * @param $text String text of the link (input is not escaped)
         */
        public function addReturnTo( $title, $query = array(), $text = null ) {
@@ -2391,7 +2391,7 @@ $templates
                        $titleObj = Title::newMainPage();
                }
 
-               $this->addReturnTo( $titleObj, $returntoquery );
+               $this->addReturnTo( $titleObj, wfCgiToArray( $returntoquery ) );
        }
 
        /**