From 62e98ad47cc61745473907f407146cb56c0947c8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 6 Aug 2004 22:30:47 +0000
Subject: [PATCH] Suppress some more warnings on separate execution of files.
 Shouldn't be anything exploitable, it's just annoying.

---
 includes/DatabasePostgreSQL.php | 2 ++
 includes/DefaultSettings.php    | 5 +++++
 includes/Namespace.php          | 3 +++
 includes/OutputPage.php         | 4 ++++
 includes/Setup.php              | 4 +++-
 includes/Skin.php               | 4 ++++
 includes/SpecialImport.php      | 2 +-
 texvc.phtml                     | 2 +-
 8 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/includes/DatabasePostgreSQL.php b/includes/DatabasePostgreSQL.php
index af7d96e972..6ada5ed04d 100644
--- a/includes/DatabasePostgreSQL.php
+++ b/includes/DatabasePostgreSQL.php
@@ -14,6 +14,8 @@
 #
 # Hashar
 
+require_once( "Database.php" );
+
 class DatabasePgsql extends Database {
 	var $mInsertId = NULL;
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bd10946f8e..d9d64eb4ed 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1,4 +1,6 @@
 <?php
+if( defined( "MEDIAWIKI" ) ) {
+
 # $Id$
 # DO NOT EDIT THIS FILE!
 # To customize your installation, edit "LocalSettings.php".
@@ -471,4 +473,7 @@ $wgUseGeoMode = false;
 # Validation for print or other production versions
 $wgUseValidation = false;
 
+} else {
+	die();
+}
 ?>
diff --git a/includes/Namespace.php b/includes/Namespace.php
index a72d24adf7..bba5deb3df 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -1,4 +1,6 @@
 <?php
+if( defined( "MEDIAWIKI" ) ) {
+
 # This is a utility class with only static functions
 # for dealing with namespaces that encodes all the
 # "magic" behaviors of them based on index.  The textual
@@ -105,4 +107,5 @@ class Namespace {
 	}
 }
 
+}
 ?>
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d0b55a4ff8..21fbe702c4 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1,4 +1,6 @@
 <?php
+if( defined( "MEDIAWIKI" ) ) {
+
 # See design.doc
 
 if($wgUseTeX) require_once( "Math.php" );
@@ -854,4 +856,6 @@ class OutputPage {
 		return ( $out );
 	}
 }
+
+}
 ?>
diff --git a/includes/Setup.php b/includes/Setup.php
index 02ae3689c5..e898d1f7ec 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,4 +1,6 @@
 <?php
+if( defined( "MEDIAWIKI" ) ) {
+
 # The main wiki script and things like database
 # conversion and maintenance scripts all share a
 # common setup of including lots of classes and
@@ -257,5 +259,5 @@ $wgFullyInitialised = true;
 wfProfileOut( $fname.'-extensions' );
 wfProfileOut( $fname );
 
-
+}
 ?>
diff --git a/includes/Skin.php b/includes/Skin.php
index dbff5d63b2..ac21c370c8 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1,4 +1,6 @@
 <?php
+if( defined( "MEDIAWIKI" ) ) {
+
 # See skin.doc
 
 require_once( 'Feed.php' );  // should not be called if the actual page isn't feed enabled
@@ -2755,5 +2757,7 @@ class Skin {
 		return $toolbar;
 	}
 
+}
+
 }
 ?>
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index a11e65c837..1fc1eebba3 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -483,7 +483,7 @@ class WikiImporter {
 				'old_comment' => $this->getComment(),
 				'old_user' => intval( $user->getId() ),
 				'old_user_text' => $user->getName(),
-				'old_timestamp' => $this->timestamp
+				'old_timestamp' => $this->timestamp,
 				'inverse_timestamp' => wfInvertTimestamp( $this->timestamp ),
 				'old_minor_edit' => 0,
 				'old_flags' => ''
diff --git a/texvc.phtml b/texvc.phtml
index a47416ec4c..108dcbda63 100644
--- a/texvc.phtml
+++ b/texvc.phtml
@@ -13,7 +13,7 @@ print ">";
 <?php
 print "<form method=\"post\" action=\"{$wgServer}{$wgScriptPath}/texvc_cgi.phtml\">"
 ?>
-<textarea name='math' rows='10' cols='80'><?
+<textarea name='math' rows='10' cols='80'><?php
 	global $math;
 	$math = preg_replace ("/\\\\\\\\/", '\\', $math);
 	print $math;
-- 
2.20.1