| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1639,7 +1639,7 @@ |
| 1640 | 1640 | * @param Title $title Title to link |
| 1641 | 1641 | * @param string $query Query string |
| 1642 | 1642 | */ |
| 1643 | | - public function addReturnTo( $title, $query ) { |
| | 1643 | + public function addReturnTo( $title, $query = array() ) { |
| 1644 | 1644 | global $wgUser; |
| 1645 | 1645 | $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) ); |
| 1646 | 1646 | $link = wfMsgHtml( 'returnto', $wgUser->getSkin()->link( |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | wfProfileIn( __METHOD__ . '-stuff' ); |
| 178 | 178 | $this->thispage = $this->mTitle->getPrefixedDBkey(); |
| 179 | 179 | $this->thisurl = $this->mTitle->getPrefixedURL(); |
| 180 | | - $query = $wgRequest->data; |
| | 180 | + $query = $wgRequest->getValues(); |
| 181 | 181 | unset( $query['title'] ); |
| 182 | 182 | $this->thisquery = wfArrayToCGI( $query ); |
| 183 | 183 | $this->loggedin = $wgUser->isLoggedIn(); |