From 1d15461a57a19739f7fad49d9a63b8b8c69da2f3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Sat, 7 Jan 2006 12:31:39 +0000
Subject: [PATCH] Code review! * Don't start a new scope with if defined
 'MEDIAWIKI...

---
 includes/ImageGallery.php | 14 +++-----------
 includes/Namespace.php    | 10 ++--------
 includes/ProxyTools.php   |  6 ++----
 includes/Skin.php         |  9 ++-------
 includes/SkinPHPTal.php   |  9 ++-------
 includes/SkinTemplate.php | 11 +++--------
 6 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index c33a3f2596..c96a699ef4 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -1,14 +1,11 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
+	
 /**
  * @package MediaWiki
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
-
-
 /**
  * Image gallery
  * 
@@ -152,9 +149,4 @@ class ImageGallery
 	}
 
 } //class
-
-
-
-
-} // defined( 'MEDIAWIKI' )
 ?>
diff --git a/includes/Namespace.php b/includes/Namespace.php
index 15fc36e5da..e366c0a2dd 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -1,15 +1,11 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
 /**
  * Provide things related to namespaces
  * @package MediaWiki
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
-
-
 /**
  * Definitions of the NS_ constants are in Defines.php
  * @private
@@ -124,6 +120,4 @@ class Namespace {
 		}
 	}
 }
-
-}
 ?>
diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index dfddd4caf1..383878d3d0 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -1,13 +1,11 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
 /**
  * Functions for dealing with proxies
  * @package MediaWiki
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die();
-}
-
 /** Work out the IP address based on various globals */
 function wfGetIP() {
 	global $wgSquidServers, $wgSquidServersNoPurge, $wgIP;
diff --git a/includes/Skin.php b/includes/Skin.php
index 3e12c7708b..8be9f86f25 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1,4 +1,6 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
 
 /**
  *
@@ -6,11 +8,6 @@
  * @subpackage Skins
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( "MEDIAWIKI" ) ) {
-
 # See skin.txt
 require_once( 'Linker.php' );
 require_once( 'Image.php' );
@@ -1437,6 +1434,4 @@ END;
 		return $bar;
 	}
 }
-
-}
 ?>
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 3efb2e3790..c6159bd2ab 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -1,4 +1,6 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -32,12 +34,6 @@
  * @subpackage Skins
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless
- * MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
-
 require_once 'GlobalFunctions.php';
 require_once 'SkinTemplate.php';
 
@@ -151,5 +147,4 @@ class PHPTAL_version_bridge {
 
 } // end of if( class_exists( 'PHPTAL' ) )
 } // end of if( class_exists( 'PEAR' ) )
-} // end of if( defined( 'MEDIAWIKI' ) ) 
 ?>
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index fbb95fbb2b..850f66dcf2 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1,4 +1,7 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+	die();
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -32,12 +35,6 @@
  * @subpackage Skins
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless
- * MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
-
 require_once 'GlobalFunctions.php';
 
 /**
@@ -1128,6 +1125,4 @@ class QuickTemplate {
 		return ($msg != '-') && ($msg != ''); # ????
 	}
 }
-
-} // end of if( defined( 'MEDIAWIKI' ) )
 ?>
-- 
2.20.1