From: Ryan Lane <laner@users.mediawiki.org>
Date: Thu, 24 Mar 2011 21:32:08 +0000 (+0000)
Subject: Follow up to r84638. Moving the $wgUser global, and fixing formatting.
X-Git-Tag: 1.31.0-rc.0~31204
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=99db57182fde7d1fd972c6043fa64a5d8eb63c43;p=lhc%2Fweb%2Fwiklou.git

Follow up to r84638. Moving the $wgUser global, and fixing formatting.
---

diff --git a/includes/Article.php b/includes/Article.php
index cc352e1446..3df5066610 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3047,7 +3047,7 @@ class Article {
 	 * Perform a deletion and output success or failure messages
 	 */
 	public function doDelete( $reason, $suppress = false ) {
-		global $wgOut, $wgUser;
+		global $wgOut;
 
 		$id = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE );
 
@@ -3099,8 +3099,9 @@ class Article {
 	 * @param $commit boolean defaults to true, triggers transaction end
 	 * @return boolean true if successful
 	 */
-	public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, &$error='' ) {
+	public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, &$error = '' ) {
 		global $wgDeferredUpdateList, $wgUseTrackbacks;
+		global $wgUser;
 
 		wfDebug( __METHOD__ . "\n" );