From 434e8ab45413ac6346674909c81a11c1999d14b7 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Mon, 21 Jun 2004 13:18:31 +0000 Subject: [PATCH] Use include_once and require_once instead of include and require, unless you have a very good reason to do otherwise. Use of require() in config/index.php apparently caused a bug. --- config/index.php | 16 ++++++++-------- install.php | 2 +- languages/LanguageSr.php | 2 +- maintenance/DiffLanguage.php | 2 +- maintenance/archives/importTests.php | 2 +- maintenance/rebuildInterwiki.php | 2 +- update.php | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/index.php b/config/index.php index 6eabb3f9af..69d4ca7519 100644 --- a/config/index.php +++ b/config/index.php @@ -110,9 +110,9 @@ header( "Content-type: text/html; charset=utf-8" ); $IP = ".."; # Just to suppress notices, not for anything useful define( "MEDIAWIKI", true ); define( "MEDIAWIKI_INSTALL", true ); -require( "../includes/DefaultSettings.php" ); -require( "../includes/MagicWord.php" ); -require( "../includes/Namespace.php" ); +require_once( "../includes/DefaultSettings.php" ); +require_once( "../includes/MagicWord.php" ); +require_once( "../includes/Namespace.php" ); ?>

MediaWiki installation

@@ -155,10 +155,10 @@ if( !is_writable( "." ) ) { } -require( "../install-utils.inc" ); -require( "../maintenance/updaters.inc" ); -require( "../maintenance/convertLinks.inc" ); -require( "../maintenance/archives/moveCustomMessages.inc" ); +require_once( "../install-utils.inc" ); +require_once( "../maintenance/updaters.inc" ); +require_once( "../maintenance/convertLinks.inc" ); +require_once( "../maintenance/archives/moveCustomMessages.inc" ); class ConfigData { function getEncoded( $data ) { @@ -904,7 +904,7 @@ function getLanguageList() { $wgLanguageCode = "xxx"; function wfLocalUrl( $x ) { return $x; } function wfLocalUrlE( $x ) { return $x; } - require( "../languages/Names.php" ); + require_once( "../languages/Names.php" ); } $codes = array(); diff --git a/install.php b/install.php index dec2020f5e..c1b3a8c2dd 100644 --- a/install.php +++ b/install.php @@ -5,7 +5,7 @@ die("obsolete; remove this file befor 1.3.0 release\n"); # Install software and create new empty database. # -include( "./install-utils.inc" ); +include_once( "./install-utils.inc" ); install_version_checks(); if ( ! ( is_readable( "./LocalSettings.php" ) diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php index a80faf0bad..a39ea86c4e 100644 --- a/languages/LanguageSr.php +++ b/languages/LanguageSr.php @@ -1,6 +1,6 @@ "-" diff --git a/maintenance/DiffLanguage.php b/maintenance/DiffLanguage.php index 0d97d22911..b015591d72 100644 --- a/maintenance/DiffLanguage.php +++ b/maintenance/DiffLanguage.php @@ -79,7 +79,7 @@ if ( isset($args[0]) ) { # include the language if it's not the already loaded one if($lang != $wgLanguageCode) { print "Including language file for $lang.\n"; - include("Language{$lang}.php"); + include_once("Language{$lang}.php"); } /* ugly hack to load the correct array, if you have a better way diff --git a/maintenance/archives/importTests.php b/maintenance/archives/importTests.php index ef751a759e..6e283790db 100644 --- a/maintenance/archives/importTests.php +++ b/maintenance/archives/importTests.php @@ -26,7 +26,7 @@ $testingonly = true; setlocale( LC_ALL, "C" ); -include( "importUseModWiki.php" ); +include_once( "importUseModWiki.php" ); $wgRootDirectory = "./testconvert"; runTests(); diff --git a/maintenance/rebuildInterwiki.php b/maintenance/rebuildInterwiki.php index dd1a66a902..328e765ea0 100644 --- a/maintenance/rebuildInterwiki.php +++ b/maintenance/rebuildInterwiki.php @@ -5,7 +5,7 @@ $oldCwd = getcwd(); $optionsWithArgs = array( "o" ); -include( "commandLine.inc" ); +include_once( "commandLine.inc" ); class Site { var $suffix, $lateral, $url; diff --git a/update.php b/update.php index 94dba69b76..ce96eaba60 100644 --- a/update.php +++ b/update.php @@ -5,7 +5,7 @@ die("obsolete; remove this file befor 1.3.0 release\n"); # Update already-installed software # -include( "./install-utils.inc" ); +include_once( "./install-utils.inc" ); require_once( "./maintenance/updaters.inc" ); install_version_checks(); @@ -20,7 +20,7 @@ $IP = "./includes"; require_once( "./LocalSettings.php" ); require_once( "./AdminSettings.php" ); -include( "$IP/Version.php" ); +include_once( "$IP/Version.php" ); if( $wgSitename == "MediaWiki" ) { die( "You must set the site name in \$wgSitename before installation.\n\n" ); -- 2.20.1