From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sun, 9 Aug 2009 12:26:11 +0000 (+0000)
Subject: Move $wgUseNormalUser setting to constructors.
X-Git-Tag: 1.31.0-rc.0~40407
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=054fa2cc5dbeba04084c7d7e79fdf2100c93412c;p=lhc%2Fweb%2Fwiklou.git

Move $wgUseNormalUser setting to constructors.
---

diff --git a/maintenance/eval.php b/maintenance/eval.php
index c25c8d63ea..c5bfaf2a9c 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -35,15 +35,16 @@ require_once( dirname(__FILE__) . '/Maintenance.php' );
 class EvalPrompt extends Maintenance {
 
 	public function __construct() {
+		global $wgUseNormalUser;
 		parent::__construct();
 		$this->mDescription = "This script lets a command-line user start up the wiki engine and then poke\n" .
 								"about by issuing PHP commands directly.";
 		$this->addOption( 'd', "Enable MediaWiki debug output", false, true );
+		$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
 	}
 	
 	public function execute() {
-		global $wgUseNormalUser, $wgDebugFunctionEntry, $wgDebugLogFile;
-		$wgUseNormalUser = (bool)getenv('MW_WIKIUSER');
+		global $wgDebugFunctionEntry, $wgDebugLogFile;
 		if ( $this->hasOption('d') ) {
 			$d = $this->getOption('d');
 			if ( $d > 0 ) {
diff --git a/maintenance/http_session_download.php b/maintenance/http_session_download.php
index 264c8affbe..3abaaf6296 100644
--- a/maintenance/http_session_download.php
+++ b/maintenance/http_session_download.php
@@ -27,19 +27,18 @@ require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class HttpSessionDownload extends Maintenance {
 	public function __construct() {
+		global $wgUseNormalUser;
 		parent::__construct();
 		$this->mDescription = "Simple entry point to initiate a background download";
 		$this->addOption( 'sid', 'Session ID', true, true );
 		$this->addOption( 'usk', 'Upload session key', true, true );
+		$wgUseNormalUser = true;
 	}
 	
 	public function execute() {
-		global $wgUseNormalUser;
+		
 		wfProfileIn(__METHOD__);
 
-		// act like a "normal user"
-		$wgUseNormalUser = true;
-
 		//run the download: 
 		Http::doSessionIdDownload( $this->getOption('sid'), $this->getOption('usk') );