Followup for bug 39099

If we're not passed an array, try and make it one..

Change-Id: I269848d08893cecfb0ac4de87a3155c916981a8d

diff --git a/includes/Uri.php b/includes/Uri.php
index 9354068..f6cf06f 100644 (file)
--- a/includes/Uri.php
+++ b/includes/Uri.php
@@ -253,15 +253,13 @@ class Uri {
         * @return Uri this URI object
         */
        public function extendQuery( $parameters ) {
-               if ( is_string( $parameters ) ) {
+               if ( !is_array( $parameters ) ) {
                        $parameters = wfCgiToArray( $parameters );
                }
 
                $query = $this->getQuery();
-               if ( count( $parameters ) ) {
-                       foreach( $parameters as $key => $value ) {
-                               $query[$key] = $value;
-                       }
+               foreach( $parameters as $key => $value ) {
+                       $query[$key] = $value;
                }
 
                $this->setQuery( $query );