From 8f22cb45b1ccd2d18bb4ef1247a18efbb9a87e2d Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Fri, 7 May 2004 13:43:10 +0000 Subject: [PATCH] include_once -> require_once --- config/index.php | 6 +-- includes/Article.php | 2 +- includes/CacheManager.php | 2 +- includes/Database.php | 4 +- includes/DatabaseFunctions.php | 2 +- includes/GlobalFunctions.php | 8 ++-- includes/OutputPage.php | 2 +- includes/Parser.php | 6 +-- includes/QueryPage.php | 4 +- includes/Setup.php | 46 ++++++++++----------- includes/Skin.php | 14 +++---- includes/SpecialAncientpages.php | 2 +- includes/SpecialDeadendpages.php | 2 +- includes/SpecialLonelypages.php | 2 +- includes/SpecialLongpages.php | 2 +- includes/SpecialMakesysop.php | 2 +- includes/SpecialMovepage.php | 2 +- includes/SpecialNewpages.php | 2 +- includes/SpecialPopularpages.php | 2 +- includes/SpecialRecentchanges.php | 2 +- includes/SpecialRecentchangeslinked.php | 2 +- includes/SpecialShortpages.php | 2 +- includes/SpecialWantedpages.php | 2 +- includes/SpecialWatchlist.php | 4 +- includes/UpdateClasses.php | 14 +++---- includes/User.php | 4 +- includes/UserMailer.php | 2 +- includes/killthread.php | 4 +- index.php | 16 +++---- install.php | 8 ++-- irc/rcdumper.php | 4 +- languages/LanguageAf.php | 2 +- languages/LanguageAr.php | 2 +- languages/LanguageBg.php | 2 +- languages/LanguageBn.php | 2 +- languages/LanguageCa.php | 2 +- languages/LanguageCs.php | 2 +- languages/LanguageCy.php | 2 +- languages/LanguageEl.php | 2 +- languages/LanguageEo.php | 2 +- languages/LanguageEt.php | 2 +- languages/LanguageFa.php | 2 +- languages/LanguageFi.php | 2 +- languages/LanguageFr.php | 2 +- languages/LanguageFy.php | 2 +- languages/LanguageGa.php | 2 +- languages/LanguageHe.php | 2 +- languages/LanguageHi.php | 2 +- languages/LanguageHu.php | 2 +- languages/LanguageIa.php | 2 +- languages/LanguageId.php | 2 +- languages/LanguageIt.php | 2 +- languages/LanguageJa.php | 2 +- languages/LanguageKo.php | 2 +- languages/LanguageLa.php | 2 +- languages/LanguageMl.php | 2 +- languages/LanguageMs.php | 2 +- languages/LanguageNo.php | 2 +- languages/LanguageOc.php | 2 +- languages/LanguagePl.php | 2 +- languages/LanguagePt.php | 2 +- languages/LanguageRo.php | 2 +- languages/LanguageRu.php | 2 +- languages/LanguageSk.php | 2 +- languages/LanguageSl.php | 2 +- languages/LanguageSq.php | 2 +- languages/LanguageTa.php | 2 +- languages/LanguageTh.php | 2 +- languages/LanguageUk.php | 2 +- languages/LanguageUr.php | 2 +- languages/LanguageUtf8.php | 2 +- languages/LanguageYi.php | 2 +- languages/LanguageZh.php | 2 +- maintenance/DiffLanguage.php | 6 +-- maintenance/archives/convertdb.php | 12 +++--- maintenance/archives/moveCustomMessages.php | 2 +- maintenance/archives/upgradeWatchlist.php | 4 +- maintenance/attribute.php | 4 +- maintenance/checktrans-enhanced.php | 4 +- maintenance/checktrans.php | 4 +- maintenance/cleandb.php | 6 +-- maintenance/compressOld.php | 8 ++-- maintenance/convertLinks.php | 4 +- maintenance/dumpMessages.php | 2 +- maintenance/importPhase2.php | 16 +++---- maintenance/mcc.php | 6 +-- maintenance/rebuildMessages.php | 8 ++-- maintenance/rebuildall.php | 12 +++--- maintenance/rebuildlinks.php | 8 ++-- maintenance/rebuildrecentchanges.php | 8 ++-- maintenance/rebuildtextindex.php | 8 ++-- maintenance/refreshLinks.php | 2 +- maintenance/remove-brokenlinks.php | 8 ++-- redirect.php | 4 +- update.php | 10 ++--- 95 files changed, 203 insertions(+), 203 deletions(-) diff --git a/config/index.php b/config/index.php index e14766d5d9..cb370532fa 100644 --- a/config/index.php +++ b/config/index.php @@ -302,8 +302,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) { $wgDBadminpassword = $wgDBpassword; $wgCommandLineMode = true; $wgUseDatabaseMessages = false; /* FIXME: For database failure */ - include_once( "Setup.php" ); - include_once( "../maintenance/InitialiseMessages.inc" ); + require_once( "Setup.php" ); + require_once( "../maintenance/InitialiseMessages.inc" ); $wgTitle = Title::newFromText( "Installation script" ); $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 ); @@ -688,7 +688,7 @@ function writeLocalSettings( $conf ) { \$IP = \"{$conf->IP}\"; ini_set( \"include_path\", \"\$IP/includes$sep\$IP/languages$sep\" . ini_get(\"include_path\") ); -include_once( \"DefaultSettings.php\" ); +require_once( \"DefaultSettings.php\" ); if ( \$wgCommandLineMode ) { if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) { diff --git a/includes/Article.php b/includes/Article.php index ab8c752e01..16101eca27 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -5,7 +5,7 @@ # Note: edit user interface and cache support functions have been # moved to separate EditPage and CacheManager classes. -include_once( "CacheManager.php" ); +require_once( "CacheManager.php" ); class Article { /* private */ var $mContent, $mContentLoaded; diff --git a/includes/CacheManager.php b/includes/CacheManager.php index 09f9a80baf..5ba6ec7318 100644 --- a/includes/CacheManager.php +++ b/includes/CacheManager.php @@ -11,7 +11,7 @@ # $wgFileCacheDirectory # $wgUseGzip -include_once( "Title.php" ); +require_once( "Title.php" ); class CacheManager { var $mTitle, $mFileCache; diff --git a/includes/Database.php b/includes/Database.php index cada7e3998..d84625492f 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -1,6 +1,6 @@ setPageTitle( wfMsg( strtolower( $wgTitle->getText() ) ) ); $inc = "Special" . $t . ".php"; - include_once( $inc ); + require_once( $inc ); $call = "wfSpecial" . $t; $call( $par ); } else if ( array_key_exists( $t, $sysopSP ) ) { diff --git a/includes/OutputPage.php b/includes/OutputPage.php index f344fe404c..e859ed2229 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1,7 +1,7 @@ diff --git a/includes/User.php b/includes/User.php index b0a5afc85d..111bebff1a 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1,7 +1,7 @@ set the wiki up first!" ); } -include_once( "./LocalSettings.php" ); +require_once( "./LocalSettings.php" ); if( $wgSitename == "MediaWiki" ) { die( "You must set the site name in \$wgSitename before installation.\n\n" ); @@ -19,7 +19,7 @@ if( $wgSitename == "MediaWiki" ) { $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":"; ini_set( "include_path", $IP . $sep . ini_get( "include_path" ) ); -include_once( "Setup.php" ); +require_once( "Setup.php" ); wfProfileIn( "main-misc-setup" ); OutputPage::setEncodings(); # Not really used yet @@ -94,7 +94,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) { switch( $wgTitle->getNamespace() ) { case NS_IMAGE: - include_once( "ImagePage.php" ); + require_once( "ImagePage.php" ); $wgArticle = new ImagePage( $wgTitle ); break; default: @@ -123,7 +123,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) { if( !$wgEnableDublinCoreRdf ) { wfHttpError( 403, "Forbidden", wfMsg( "nodublincore" ) ); } else { - include_once( "Metadata.php" ); + require_once( "Metadata.php" ); wfDublinCoreRdf( $wgArticle ); } break; @@ -131,7 +131,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) { if( !$wgEnableCreativeCommonsRdf ) { wfHttpError( 403, "Forbidden", wfMsg("nocreativecommons") ); } else { - include_once( "Metadata.php" ); + require_once( "Metadata.php" ); wfCreativeCommonsRdf( $wgArticle ); } break; @@ -140,7 +140,7 @@ if ( $search = $wgRequest->getText( 'search' ) ) { if( !$wgCommandLineMode && !$wgRequest->checkSessionCookie() ) { User::SetupSession(); } - include_once( "EditPage.php" ); + require_once( "EditPage.php" ); $editor = new EditPage( $wgArticle ); $editor->$action(); break; @@ -148,12 +148,12 @@ if ( $search = $wgRequest->getText( 'search' ) ) { if ($_SERVER["REQUEST_URI"] == $wgTitle->getInternalURL('action=history')) { $wgOut->setSquidMaxage( $wgSquidMaxage ); } - include_once( "PageHistory.php" ); + require_once( "PageHistory.php" ); $history = new PageHistory( $wgArticle ); $history->history(); break; case "raw": - include_once( "RawPage.php" ); + require_once( "RawPage.php" ); $raw = new RawPage( $wgArticle ); $raw->view(); break; diff --git a/install.php b/install.php index bf96077cfb..dec2020f5e 100644 --- a/install.php +++ b/install.php @@ -17,9 +17,9 @@ if ( ! ( is_readable( "./LocalSettings.php" ) } $DP = "./includes"; -include_once( "./LocalSettings.php" ); -include_once( "./AdminSettings.php" ); -include_once( "./maintenance/InitialiseMessages.inc" ); +require_once( "./LocalSettings.php" ); +require_once( "./AdminSettings.php" ); +require_once( "./maintenance/InitialiseMessages.inc" ); if( $wgSitename == "MediaWiki" ) { die( "You must set the site name in \$wgSitename before installation.\n\n" ); @@ -131,7 +131,7 @@ $rootpw=readconsole(); # $wgUseDatabaseMessages = false; # no DB yet -include_once( "{$IP}/Setup.php" ); +require_once( "{$IP}/Setup.php" ); $wgTitle = Title::newFromText( "Installation script" ); $wgDatabase = Database::newFromParams( $wgDBserver, "root", $rootpw, "", 1 ); diff --git a/irc/rcdumper.php b/irc/rcdumper.php index 0ba026cd79..11555a2cf4 100644 --- a/irc/rcdumper.php +++ b/irc/rcdumper.php @@ -31,8 +31,8 @@ ini_set( "include_path", "$newpath$IP$sep$include_path" ); $wgCommandLineMode = true; $DP = "../includes"; -include_once( $settingsFile ); -include_once( "Setup.php" ); +require_once( $settingsFile ); +require_once( "Setup.php" ); $wgTitle = Title::newFromText( "RC dumper" ); $wgCommandLineMode = true; set_time_limit(0); diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php index 1d2932cfa0..4f5a7774c3 100644 --- a/languages/LanguageAf.php +++ b/languages/LanguageAf.php @@ -820,7 +820,7 @@ Kies asseblief 'n ander naam.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageAf extends LanguageUtf8 { diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php index 2b01b5ee02..95706cf9da 100644 --- a/languages/LanguageAr.php +++ b/languages/LanguageAr.php @@ -1,6 +1,6 @@ "ملف", diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php index 35019958fe..19e32c2df9 100644 --- a/languages/LanguageBg.php +++ b/languages/LanguageBg.php @@ -1157,7 +1157,7 @@ $3... "thumbnail-more" => "Увеличаване" ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageBg extends LanguageUtf8 { diff --git a/languages/LanguageBn.php b/languages/LanguageBn.php index 6f711041bd..357854e619 100644 --- a/languages/LanguageBn.php +++ b/languages/LanguageBn.php @@ -971,7 +971,7 @@ title. Please merge them manually.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageBn extends LanguageUtf8 { function getNamespaces() { diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php index b23c382ca3..8c351ee273 100644 --- a/languages/LanguageCa.php +++ b/languages/LanguageCa.php @@ -889,7 +889,7 @@ Incorporeu-les manualment, si us plau.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageCa extends LanguageUtf8 { # Inherent default user options unless customization is desired diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php index 2932c5a956..fc1f781a26 100644 --- a/languages/LanguageCs.php +++ b/languages/LanguageCs.php @@ -732,7 +732,7 @@ abys mohl stránku přesunout.", ); global $IP; -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); class LanguageCs extends LanguageUtf8 { diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php index a847ae4ab2..5138e69924 100644 --- a/languages/LanguageCy.php +++ b/languages/LanguageCy.php @@ -1038,7 +1038,7 @@ amusement.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageCy extends LanguageUtf8 { diff --git a/languages/LanguageEl.php b/languages/LanguageEl.php index b5872e4c70..ef89ebf78b 100644 --- a/languages/LanguageEl.php +++ b/languages/LanguageEl.php @@ -1,6 +1,6 @@ "Artikkelin keskustelusivua ei siirretty.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageFi extends LanguageUtf8 { diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php index 482b04e1d4..1aa2c84dc2 100644 --- a/languages/LanguageFr.php +++ b/languages/LanguageFr.php @@ -5,7 +5,7 @@ // The names of the namespaces can be set here, but the numbers // are magical, so don't change or move them! The Namespace class // encapsulates some of the magic-ness. -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); /* private */ $wgNamespaceNamesFr = array( diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php index 9de585434c..96b56ef6b7 100644 --- a/languages/LanguageFy.php +++ b/languages/LanguageFy.php @@ -8,7 +8,7 @@ # encapsulates some of the magic-ness. # -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); if($wgMetaNamespace === FALSE) $wgMetaNamespace = str_replace( " ", "_", $wgSitename ); diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php index 1018a81386..886732c806 100755 --- a/languages/LanguageGa.php +++ b/languages/LanguageGa.php @@ -1125,7 +1125,7 @@ air, nó is féidir leat é a coinnigh do do siamsa féin.", "allmessagestext" => "Seo é liosta de na teachtaireachtaí go léir atá le fáil san roinn MediaWiki: ." ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageGa extends LanguageUtf8 { diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php index 25a20e6a76..c3ce75dfcd 100644 --- a/languages/LanguageHe.php +++ b/languages/LanguageHe.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageHi.php b/languages/LanguageHi.php index 2555de2b12..9e52c34772 100644 --- a/languages/LanguageHi.php +++ b/languages/LanguageHi.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageHu.php b/languages/LanguageHu.php index 054f2458b4..f90cee02ff 100644 --- a/languages/LanguageHu.php +++ b/languages/LanguageHu.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageIa.php b/languages/LanguageIa.php index c3881b0556..d129149287 100644 --- a/languages/LanguageIa.php +++ b/languages/LanguageIa.php @@ -920,7 +920,7 @@ nove titulo. Per favor fusiona los manualmente.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageIa extends LanguageUtf8 { diff --git a/languages/LanguageId.php b/languages/LanguageId.php index 8ac9ed42a4..1fbb3cc82b 100644 --- a/languages/LanguageId.php +++ b/languages/LanguageId.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php index ce8ffd0411..8a07adda94 100644 --- a/languages/LanguagePt.php +++ b/languages/LanguagePt.php @@ -939,7 +939,7 @@ Por favor, escolha outro nome.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguagePt extends LanguageUtf8 { diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php index 520ee33d8e..64e03316f9 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php index e445de444c..b5e76c7358 100644 --- a/languages/LanguageRu.php +++ b/languages/LanguageRu.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php index 6a9f2a7e72..6df1d6975b 100644 --- a/languages/LanguageSk.php +++ b/languages/LanguageSk.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageSq.php b/languages/LanguageSq.php index 5a103dd829..237f76d432 100644 --- a/languages/LanguageSq.php +++ b/languages/LanguageSq.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageTa.php b/languages/LanguageTa.php index e97c117ff3..94e6e03094 100644 --- a/languages/LanguageTa.php +++ b/languages/LanguageTa.php @@ -1,6 +1,6 @@ "-" diff --git a/languages/LanguageUr.php b/languages/LanguageUr.php index bed070fd31..06a8797979 100644 --- a/languages/LanguageUr.php +++ b/languages/LanguageUr.php @@ -2,7 +2,7 @@ # Stub for Urdu -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageUr extends LanguageUtf8 { diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php index b90468d6ef..06d613a329 100644 --- a/languages/LanguageUtf8.php +++ b/languages/LanguageUtf8.php @@ -7,7 +7,7 @@ $wikiUpperChars = $wgMemc->get( $key1 = "$wgDBname:utf8:upper" ); $wikiLowerChars = $wgMemc->get( $key2 = "$wgDBname:utf8:lower" ); if(empty( $wikiUpperChars) || empty($wikiLowerChars )) { - include_once( "Utf8Case.php" ); + require_once( "Utf8Case.php" ); $wgMemc->set( $key1, $wikiUpperChars ); $wgMemc->set( $key2, $wikiLowerChars ); } diff --git a/languages/LanguageYi.php b/languages/LanguageYi.php index b451a5e1f1..60d8b93215 100644 --- a/languages/LanguageYi.php +++ b/languages/LanguageYi.php @@ -2,7 +2,7 @@ # Stub for Yiddish -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageYi extends LanguageUtf8 { diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php index a863b91f01..3f714cf815 100644 --- a/languages/LanguageZh.php +++ b/languages/LanguageZh.php @@ -1,5 +1,5 @@ "-" diff --git a/maintenance/DiffLanguage.php b/maintenance/DiffLanguage.php index 4058208779..7857635f43 100644 --- a/maintenance/DiffLanguage.php +++ b/maintenance/DiffLanguage.php @@ -45,9 +45,9 @@ $wgCommandLineMode = true; # Turn off output buffering if it's on @ob_end_flush(); -include_once("../LocalSettings.php"); -include_once( "../includes/Setup.php" ); -include_once( "../install-utils.inc" ); +require_once("../LocalSettings.php"); +require_once( "../includes/Setup.php" ); +require_once( "../install-utils.inc" ); $wgLanguageCode = strtoupper(substr($wgLanguageCode,0,1)).strtolower(substr($wgLanguageCode,1)); diff --git a/maintenance/archives/convertdb.php b/maintenance/archives/convertdb.php index e9bb785f74..4b330fa7f8 100644 --- a/maintenance/archives/convertdb.php +++ b/maintenance/archives/convertdb.php @@ -11,14 +11,14 @@ exit(); # dump files. global $IP; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); -include_once( "$IP/Setup.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); +require_once( "$IP/Setup.php" ); $wgTitle = Title::newFromText( "Conversion script" ); -include_once( "./rebuildLinks.inc" ); -include_once( "./rebuildRecentchanges.inc" ); -include_once( "./buildTables.inc" ); +require_once( "./rebuildLinks.inc" ); +require_once( "./rebuildRecentchanges.inc" ); +require_once( "./buildTables.inc" ); set_time_limit(0); $wgDBuser = "wikiadmin"; diff --git a/maintenance/archives/moveCustomMessages.php b/maintenance/archives/moveCustomMessages.php index 244bd1c6a1..bcd4974350 100644 --- a/maintenance/archives/moveCustomMessages.php +++ b/maintenance/archives/moveCustomMessages.php @@ -8,7 +8,7 @@ # 3. Convert the text to suit the new syntax chdir( ".." ); -include_once( "commandLine.inc" ); +require_once( "commandLine.inc" ); $phase = 0; if ( is_numeric( @$argv[2] ) && $argv[2] > 0) { diff --git a/maintenance/archives/upgradeWatchlist.php b/maintenance/archives/upgradeWatchlist.php index 1027bb8796..cd32eb5fb5 100644 --- a/maintenance/archives/upgradeWatchlist.php +++ b/maintenance/archives/upgradeWatchlist.php @@ -9,8 +9,8 @@ exit(); # Convert watchlists to new format global $IP; -include_once( "../LocalSettings.php" ); -include_once( "$IP/Setup.php" ); +require_once( "../LocalSettings.php" ); +require_once( "$IP/Setup.php" ); $wgTitle = Title::newFromText( "Rebuild links script" ); set_time_limit(0); diff --git a/maintenance/attribute.php b/maintenance/attribute.php index 1b9e659b4f..56c2d2acb3 100644 --- a/maintenance/attribute.php +++ b/maintenance/attribute.php @@ -20,8 +20,8 @@ $DP = "../includes"; $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "/apache/htdocs/$lang/w/LocalSettings.php" ); -include_once( "Setup.php" ); +require_once( "/apache/htdocs/$lang/w/LocalSettings.php" ); +require_once( "Setup.php" ); $wgTitle = Title::newFromText( "Changing attribution script" ); set_time_limit(0); diff --git a/maintenance/checktrans-enhanced.php b/maintenance/checktrans-enhanced.php index 9c2d7dc062..b8e6b67891 100644 --- a/maintenance/checktrans-enhanced.php +++ b/maintenance/checktrans-enhanced.php @@ -49,7 +49,7 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { } $DP = "../includes"; -include_once( "../LocalSettings.php" ); +require_once( "../LocalSettings.php" ); if ( "en" == $wgLanguageCode ) { print "Current selected language is English. Cannot check translations.\n"; @@ -65,7 +65,7 @@ if ( ! is_readable( "{$IP}/{$include}" ) ) { umask( 000 ); set_time_limit( 0 ); -include_once( "{$IP}/Setup.php" ); +require_once( "{$IP}/Setup.php" ); $wgTitle = Title::newFromText( "Translation checking script" ); $wgCommandLineMode = true; diff --git a/maintenance/checktrans.php b/maintenance/checktrans.php index 10386b970a..2281e4331e 100644 --- a/maintenance/checktrans.php +++ b/maintenance/checktrans.php @@ -14,7 +14,7 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); +require_once( "../LocalSettings.php" ); if ( "en" == $wgLanguageCode ) { print "Current selected language is English. Cannot check translations.\n"; @@ -30,7 +30,7 @@ if ( ! is_readable( "{$IP}/{$include}" ) ) { umask( 000 ); set_time_limit( 0 ); -include_once( "{$IP}/Setup.php" ); +require_once( "{$IP}/Setup.php" ); $wgTitle = Title::newFromText( "Translation checking script" ); $count = $total = 0; diff --git a/maintenance/cleandb.php b/maintenance/cleandb.php index 15e61958a8..ce93c6625e 100644 --- a/maintenance/cleandb.php +++ b/maintenance/cleandb.php @@ -4,15 +4,15 @@ # script from the old format needs to be run, but not both. $wgCommandLineMode = true; -include_once( "../LocalSettings.php" ); +require_once( "../LocalSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); +require_once( "Setup.php" ); $wgTitle = Title::newFromText( "Database creation script" ); -include_once( "./buildTables.inc" ); +require_once( "./buildTables.inc" ); set_time_limit(0); #$wgDBname = "wikidb"; diff --git a/maintenance/compressOld.php b/maintenance/compressOld.php index df147c1f81..d3b88ddf99 100644 --- a/maintenance/compressOld.php +++ b/maintenance/compressOld.php @@ -11,14 +11,14 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./compressOld.inc" ); +require_once( "Setup.php" ); +require_once( "./compressOld.inc" ); $wgTitle = Title::newFromText( "Compress old pages script" ); set_time_limit(0); diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php index 55eef53f08..fefa962cdc 100644 --- a/maintenance/convertLinks.php +++ b/maintenance/convertLinks.php @@ -4,9 +4,9 @@ # The wiki should be put into read-only mode while this script executes -include_once( "commandLine.inc" ); +require_once( "commandLine.inc" ); # the below should probably be moved into commandLine.inc at some point -include_once( "../AdminSettings.php" ); +require_once( "../AdminSettings.php" ); $numRows = $tuplesAdded = $numBadLinks = $curRowsRead = 0; #counters etc $totalTuplesInserted = 0; # total tuples INSERTed into links_temp diff --git a/maintenance/dumpMessages.php b/maintenance/dumpMessages.php index dad2b31b7e..e4c54601d0 100644 --- a/maintenance/dumpMessages.php +++ b/maintenance/dumpMessages.php @@ -1,5 +1,5 @@ $englishValue ) diff --git a/maintenance/importPhase2.php b/maintenance/importPhase2.php index e0c54b676c..66c02d86dc 100644 --- a/maintenance/importPhase2.php +++ b/maintenance/importPhase2.php @@ -31,8 +31,8 @@ $wgCommandLineMode = true; ini_set("implicit_flush", 1); $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $wgDBuser = $wgDBadminuser; $wgDBpassword = $wgDBadminpassword; @@ -40,13 +40,13 @@ $wgDBpassword = $wgDBadminpassword; $sep = ( DIRECTORY_SEPARATOR == "\\" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); +require_once( "Setup.php" ); -include_once( "../install-utils.inc" ); -include_once( "InitialiseMessages.inc" ); -include_once( "rebuildlinks.inc" ); -include_once( "rebuildrecentchanges.inc" ); -include_once( "rebuildtextindex.inc" ); +require_once( "../install-utils.inc" ); +require_once( "InitialiseMessages.inc" ); +require_once( "rebuildlinks.inc" ); +require_once( "rebuildrecentchanges.inc" ); +require_once( "rebuildtextindex.inc" ); class Phase2Importer { var $olddb, $titleCache; diff --git a/maintenance/mcc.php b/maintenance/mcc.php index 66fe6664a9..a6b524916a 100755 --- a/maintenance/mcc.php +++ b/maintenance/mcc.php @@ -1,7 +1,7 @@ set_servers( $wgMemCachedServers ); diff --git a/maintenance/rebuildMessages.php b/maintenance/rebuildMessages.php index d892f3717c..d97d16f452 100755 --- a/maintenance/rebuildMessages.php +++ b/maintenance/rebuildMessages.php @@ -32,11 +32,11 @@ ini_set( "include_path", "../includes$sep../languages$sep$newpath$IP$sep$include $wgCommandLineMode = true; $DP = "../includes"; -include_once( $settingsFile ); +require_once( $settingsFile ); -include_once( "Setup.php" ); -include_once( "./InitialiseMessages.inc" ); -include_once( "../install-utils.inc" ); +require_once( "Setup.php" ); +require_once( "./InitialiseMessages.inc" ); +require_once( "../install-utils.inc" ); $wgTitle = Title::newFromText( "Rebuild messages script" ); $wgCommandLineMode = true; set_time_limit(0); diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php index a47e508302..a9d0a97604 100644 --- a/maintenance/rebuildall.php +++ b/maintenance/rebuildall.php @@ -11,16 +11,16 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./rebuildlinks.inc" ); -include_once( "./rebuildtextindex.inc" ); -include_once( "./rebuildrecentchanges.inc" ); +require_once( "Setup.php" ); +require_once( "./rebuildlinks.inc" ); +require_once( "./rebuildtextindex.inc" ); +require_once( "./rebuildrecentchanges.inc" ); $wgTitle = Title::newFromText( "Rebuild links script" ); set_time_limit(0); diff --git a/maintenance/rebuildlinks.php b/maintenance/rebuildlinks.php index f03cd9afde..bc4a291f97 100644 --- a/maintenance/rebuildlinks.php +++ b/maintenance/rebuildlinks.php @@ -13,14 +13,14 @@ $wgCommandLineMode = true; ini_set("implicit_flush", 1); $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./rebuildlinks.inc" ); +require_once( "Setup.php" ); +require_once( "./rebuildlinks.inc" ); $wgTitle = Title::newFromText( "Rebuild links script" ); set_time_limit(0); diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php index 8949b76dbb..3ea838b613 100644 --- a/maintenance/rebuildrecentchanges.php +++ b/maintenance/rebuildrecentchanges.php @@ -11,14 +11,14 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./rebuildrecentchanges.inc" ); +require_once( "Setup.php" ); +require_once( "./rebuildrecentchanges.inc" ); $wgTitle = Title::newFromText( "Rebuild recent changes script" ); set_time_limit(0); diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php index 7206d32aea..e936681729 100644 --- a/maintenance/rebuildtextindex.php +++ b/maintenance/rebuildtextindex.php @@ -11,14 +11,14 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./rebuildtextindex.inc" ); +require_once( "Setup.php" ); +require_once( "./rebuildtextindex.inc" ); $wgTitle = Title::newFromText( "Rebuild text index script" ); set_time_limit(0); diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php index 6177de62c0..089e6a70b5 100644 --- a/maintenance/refreshLinks.php +++ b/maintenance/refreshLinks.php @@ -2,7 +2,7 @@ define( "REPORTING_INTERVAL", 50 ); define( "PAUSE_INTERVAL", 50 ); -include_once( "commandLine.inc" ); +require_once( "commandLine.inc" ); error_reporting( E_ALL & (~E_NOTICE) ); diff --git a/maintenance/remove-brokenlinks.php b/maintenance/remove-brokenlinks.php index 74de741b9a..89a3003399 100644 --- a/maintenance/remove-brokenlinks.php +++ b/maintenance/remove-brokenlinks.php @@ -10,14 +10,14 @@ if ( ! is_readable( "../LocalSettings.php" ) ) { $wgCommandLineMode = true; $DP = "../includes"; -include_once( "../LocalSettings.php" ); -include_once( "../AdminSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../AdminSettings.php" ); $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":"; ini_set( "include_path", "$IP$sep$include_path" ); -include_once( "Setup.php" ); -include_once( "./rebuildrecentchanges.inc" ); +require_once( "Setup.php" ); +require_once( "./rebuildrecentchanges.inc" ); $wgTitle = Title::newFromText( "Rebuild brokenlinks script" ); set_time_limit(0); diff --git a/redirect.php b/redirect.php index 8694e8151c..6b69aee824 100644 --- a/redirect.php +++ b/redirect.php @@ -3,10 +3,10 @@ unset( $DP ); unset( $IP ); $wgCommandLineMode = false; -include_once( "./LocalSettings.php" ); +require_once( "./LocalSettings.php" ); global $wgArticlePath; -include_once( "WebRequest.php" ); +require_once( "WebRequest.php" ); $wgRequest = new WebRequest(); $page = $wgRequest->getVal( "wpDropdown" ); diff --git a/update.php b/update.php index e210394eea..150e01b47d 100644 --- a/update.php +++ b/update.php @@ -6,7 +6,7 @@ die("obsolete; remove this file befor 1.3.0 release\n"); # include( "./install-utils.inc" ); -include_once( "./maintenance/updaters.inc" ); +require_once( "./maintenance/updaters.inc" ); install_version_checks(); if ( ! ( is_readable( "./LocalSettings.php" ) @@ -17,8 +17,8 @@ if ( ! ( is_readable( "./LocalSettings.php" ) } $IP = "./includes"; -include_once( "./LocalSettings.php" ); -include_once( "./AdminSettings.php" ); +require_once( "./LocalSettings.php" ); +require_once( "./AdminSettings.php" ); include( "$IP/Version.php" ); @@ -40,8 +40,8 @@ do_update_files(); $wgDBuser = $wgDBadminuser; $wgDBpassword = $wgDBadminpassword; -include_once( "{$IP}/Setup.php" ); -include_once( "./maintenance/InitialiseMessages.inc" ); +require_once( "{$IP}/Setup.php" ); +require_once( "./maintenance/InitialiseMessages.inc" ); $wgTitle = Title::newFromText( "Update script" ); -- 2.20.1