From: Thomas Bleher <tbleher@users.mediawiki.org>
Date: Thu, 10 Jan 2008 16:51:45 +0000 (+0000)
Subject: Fix some places where globals where used without being declared as
X-Git-Tag: 1.31.0-rc.0~50071
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=60731518dbba0af4955b661732ecf3fe1fbb91a9;p=lhc%2Fweb%2Fwiklou.git

Fix some places where globals where used without being declared as
being global. Also remove one unused variable.
---

diff --git a/includes/User.php b/includes/User.php
index 00c8981e58..6734c322ee 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1961,6 +1961,7 @@ class User {
 	 * Logout user.
 	 */
 	function logout() {
+		global $wgUser;
 		if( wfRunHooks( 'UserLogout', array(&$this) ) ) {
 			$this->doLogout();
 			wfRunHooks( 'UserLogoutComplete', array(&$wgUser) );
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 39382f3a3e..4e9475462b 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -42,7 +42,6 @@ class ApiParse extends ApiBase {
 		$params = $this->extractRequestParams();
 		$text = $params['text'];
 		$title = $params['title'];
-		$retval = '';
 
 		//Create title for parser
 		$title_obj = Title :: newFromText($params['title']);