Couple of issues in r53270: use accessor method and keep the function signature bc

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index df9a4b7..644dec7 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1639,7 +1639,7 @@ class OutputPage {
         * @param Title $title Title to link
         * @param string $query Query string
         */
-       public function addReturnTo( $title, $query ) {
+       public function addReturnTo( $title, $query = array() ) {
                global $wgUser;
                $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
                $link = wfMsgHtml( 'returnto', $wgUser->getSkin()->link(

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index f915bcb..cb970d9 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -176,7 +176,7 @@ class SkinTemplate extends Skin {
                wfProfileIn( __METHOD__ . '-stuff' );
                $this->thispage = $this->mTitle->getPrefixedDBkey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
-               $query = $wgRequest->data;
+               $query = $wgRequest->getValues();
                unset( $query['title'] );
                $this->thisquery = wfArrayToCGI( $query );
                $this->loggedin = $wgUser->isLoggedIn();