From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 31 Dec 2008 17:56:04 +0000 (+0000)
Subject: Revert r45063 "Move doNothing return check above global declarations"
X-Git-Tag: 1.31.0-rc.0~43672
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=d2496f69df289a98190672738842005940640d07;p=lhc%2Fweb%2Fwiklou.git

Revert r45063 "Move doNothing return check above global declarations"
Change makes the code harder to read by hiding a control statement in the middle of a global declaraction chunk.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ab974785db..f8dba714a2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -798,13 +798,16 @@ class OutputPage {
 	 * the object, let's actually output it:
 	 */
 	public function output() {
-		if( $this->mDoNothing ) return;
 		global $wgUser, $wgOutputEncoding, $wgRequest;
 		global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
 		global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch;
 		global $wgEnableMWSuggest, $wgUniversalEditButton;
 		global $wgArticle, $wgTitle;
 
+		if( $this->mDoNothing ){
+			return;
+		}
+
 		wfProfileIn( __METHOD__ );
 
 		if ( '' != $this->mRedirect ) {