From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 17 Aug 2009 20:28:24 +0000 (+0000)
Subject: Follow-up to r54556: fix login/logout links in core
X-Git-Tag: 1.31.0-rc.0~40256
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=7381c2b29610f26a0cbf665331568a18aa15e41f;p=lhc%2Fweb%2Fwiklou.git

Follow-up to r54556: fix login/logout links in core
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index c91c580abc..cb260ef842 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -162,10 +162,13 @@ class SkinTemplate extends Skin {
 		wfProfileIn( __METHOD__ . '-stuff' );
 		$this->thispage = $this->mTitle->getPrefixedDBkey();
 		$this->thisurl = $this->mTitle->getPrefixedURL();
-		$query = $wgRequest->getValues();
-		unset( $query['title'] );
-		unset( $query['returnto'] );
-		unset( $query['returntoquery'] );
+		$query = array();
+		if ( !$wgRequest->wasPosted() ) {
+			$query = $wgRequest->getValues();
+			unset( $query['title'] );
+			unset( $query['returnto'] );
+			unset( $query['returntoquery'] );
+		}
 		$this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
 		$this->loggedin = $wgUser->isLoggedIn();
 		$this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );