From 3cf4ba377a18bac88b77b099ccb1469c92ba06d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 15 Jul 2009 06:43:42 +0000 Subject: [PATCH] Couple of issues in r53270: use accessor method and keep the function signature bc --- includes/OutputPage.php | 2 +- includes/SkinTemplate.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index df9a4b7186..644dec7be0 100644 --- 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 f915bcb682..cb970d945a 100644 --- 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(); -- 2.20.1