diff options
95 files changed, 203 insertions, 203 deletions
diff --git a/config/index.php b/config/index.php index e14766d5d963..cb370532fa04 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 ab8c752e019e..16101eca27c8 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 09f9a80bafb6..5ba6ec7318e4 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 cada7e39985f..d84625492f8e 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -1,6 +1,6 @@ <?php -include_once( "FulltextStoplist.php" ); -include_once( "CacheManager.php" ); +require_once( "FulltextStoplist.php" ); +require_once( "CacheManager.php" ); define( "DB_READ", -1 ); define( "DB_WRITE", -2 ); diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php index c1452c7dc7eb..90bb40f19370 100644 --- a/includes/DatabaseFunctions.php +++ b/includes/DatabaseFunctions.php @@ -11,7 +11,7 @@ # not access the $wgDatabase variable directly unless # you intend to set it. Use wfGetDB(). -include_once( "Database.php" ); +require_once( "Database.php" ); # Query the database # $db: DB_READ = -1 read from slave (or only server) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index e52d688677f8..d78d2637225d 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -5,9 +5,9 @@ $wgNumberOfArticles = -1; # Unset $wgTotalViews = -1; $wgTotalEdits = -1; -include_once( "DatabaseFunctions.php" ); -include_once( "UpdateClasses.php" ); -include_once( "LogPage.php" ); +require_once( "DatabaseFunctions.php" ); +require_once( "UpdateClasses.php" ); +require_once( "LogPage.php" ); /* * Compatibility functions @@ -296,7 +296,7 @@ function wfSpecialPage() $wgOut->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 f344fe404cd1..e859ed222996 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1,7 +1,7 @@ <?php # See design.doc -if($wgUseTeX) include_once( "Math.php" ); +if($wgUseTeX) require_once( "Math.php" ); class OutputPage { var $mHeaders, $mCookies, $mMetatags, $mKeywords; diff --git a/includes/Parser.php b/includes/Parser.php index 898faf0ffd5a..54a6528b3adc 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -1,12 +1,12 @@ <?php -include_once('Tokenizer.php'); +require_once('Tokenizer.php'); if( $GLOBALS['wgUseWikiHiero'] ){ - include_once('wikihiero.php'); + require_once('wikihiero.php'); } if( $GLOBALS['wgUseTimeline'] ){ - include_once('extensions/timeline/Timeline.php'); + require_once('extensions/timeline/Timeline.php'); } # PHP Parser diff --git a/includes/QueryPage.php b/includes/QueryPage.php index da0aaa017e97..d0f250e7aea5 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -1,7 +1,7 @@ <?php -include_once ( "LogPage.php" ) ; -include_once ( "Feed.php" ); +require_once ( "LogPage.php" ) ; +require_once ( "Feed.php" ); # This is a class for doing query pages; since they're almost all the same, # we factor out some of the functionality into a superclass, and let diff --git a/includes/Setup.php b/includes/Setup.php index cb138720292b..6a55446a913f 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -11,7 +11,7 @@ if( !isset( $wgProfiling ) ) $wgProfiling = false; if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) { - include_once( "Profiling.php" ); + require_once( "Profiling.php" ); } else { function wfProfileIn( $fn ) {} function wfProfileOut( $fn = "" ) {} @@ -39,25 +39,25 @@ wfProfileIn( $fname ); global $wgUseDynamicDates; wfProfileIn( "$fname-includes" ); -include_once( "GlobalFunctions.php" ); -include_once( "Namespace.php" ); -include_once( "RecentChange.php" ); -include_once( "Skin.php" ); -include_once( "OutputPage.php" ); -include_once( "User.php" ); -include_once( "LinkCache.php" ); -include_once( "Title.php" ); -include_once( "Article.php" ); -include_once( "MagicWord.php" ); -include_once( "memcached-client.php" ); -include_once( "Block.php" ); -include_once( "SearchEngine.php" ); -include_once( "DifferenceEngine.php" ); -include_once( "MessageCache.php" ); -include_once( "BlockCache.php" ); -include_once( "Parser.php" ); -include_once( "ParserCache.php" ); -include_once( "WebRequest.php" ); +require_once( "GlobalFunctions.php" ); +require_once( "Namespace.php" ); +require_once( "RecentChange.php" ); +require_once( "Skin.php" ); +require_once( "OutputPage.php" ); +require_once( "User.php" ); +require_once( "LinkCache.php" ); +require_once( "Title.php" ); +require_once( "Article.php" ); +require_once( "MagicWord.php" ); +require_once( "memcached-client.php" ); +require_once( "Block.php" ); +require_once( "SearchEngine.php" ); +require_once( "DifferenceEngine.php" ); +require_once( "MessageCache.php" ); +require_once( "BlockCache.php" ); +require_once( "Parser.php" ); +require_once( "ParserCache.php" ); +require_once( "WebRequest.php" ); $wgRequest = new WebRequest(); @@ -135,13 +135,13 @@ if( $wgUseMemCached ) { wfProfileOut( "$fname-memcached" ); wfProfileIn( "$fname-misc" ); -include_once( "Language.php" ); +require_once( "Language.php" ); $wgMessageCache = new MessageCache; $wgLangClass = "Language" . ucfirst( $wgLanguageCode ); if( ! class_exists( $wgLangClass ) || ($wgLanguageCode == "en" && strcasecmp( $wgInputEncoding, "utf-8" ) == 0 ) ) { - include_once( "LanguageUtf8.php" ); + require_once( "LanguageUtf8.php" ); $wgLangClass = "LanguageUtf8"; } @@ -155,7 +155,7 @@ $wgOut = new OutputPage(); wfDebug( "\n\n" ); if ( $wgUseDynamicDates ) { - include_once( "DateFormatter.php" ); + require_once( "DateFormatter.php" ); global $wgDateFormatter; $wgDateFormatter = new DateFormatter; } diff --git a/includes/Skin.php b/includes/Skin.php index c4686d12d50b..2720affbeede 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1,7 +1,7 @@ <?php -include_once( "Feed.php" ); -include_once( "Image.php" ); +require_once( "Feed.php" ); +require_once( "Image.php" ); # See skin.doc @@ -22,7 +22,7 @@ if( $wgUsePHPTal ) { #$wgValidSkinNames['monobookminimal'] = "MonoBookMinimal"; } -include_once( "RecentChange.php" ); +require_once( "RecentChange.php" ); class RCCacheEntry extends RecentChange { @@ -2644,12 +2644,12 @@ class Skin { } } -include_once( "SkinStandard.php" ); -include_once( "SkinNostalgia.php" ); -include_once( "SkinCologneBlue.php" ); +require_once( "SkinStandard.php" ); +require_once( "SkinNostalgia.php" ); +require_once( "SkinCologneBlue.php" ); if( $wgUsePHPTal ) { - include_once( "SkinPHPTal.php" ); + require_once( "SkinPHPTal.php" ); } diff --git a/includes/SpecialAncientpages.php b/includes/SpecialAncientpages.php index 13c97b4c331a..1b9a897bba85 100644 --- a/includes/SpecialAncientpages.php +++ b/includes/SpecialAncientpages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class AncientPagesPage extends QueryPage { diff --git a/includes/SpecialDeadendpages.php b/includes/SpecialDeadendpages.php index e30875f7df2b..0c392804b7d2 100644 --- a/includes/SpecialDeadendpages.php +++ b/includes/SpecialDeadendpages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class DeadendPagesPage extends PageQueryPage { diff --git a/includes/SpecialLonelypages.php b/includes/SpecialLonelypages.php index 1397dbf34f92..bd5286414c6f 100644 --- a/includes/SpecialLonelypages.php +++ b/includes/SpecialLonelypages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class LonelyPagesPage extends PageQueryPage { diff --git a/includes/SpecialLongpages.php b/includes/SpecialLongpages.php index 403801d2b23b..a02120ce0377 100644 --- a/includes/SpecialLongpages.php +++ b/includes/SpecialLongpages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class LongPagesPage extends QueryPage { diff --git a/includes/SpecialMakesysop.php b/includes/SpecialMakesysop.php index f26f3c5c994c..653f06256e60 100644 --- a/includes/SpecialMakesysop.php +++ b/includes/SpecialMakesysop.php @@ -1,5 +1,5 @@ <?php -include_once( "LinksUpdate.php" ); +require_once( "LinksUpdate.php" ); function wfSpecialMakesysop() { diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php index 07ef62e15205..329c0d28cfbb 100644 --- a/includes/SpecialMovepage.php +++ b/includes/SpecialMovepage.php @@ -1,5 +1,5 @@ <?php -include_once( "LinksUpdate.php" ); +require_once( "LinksUpdate.php" ); function wfSpecialMovepage() { diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php index 4368d28829e0..b23bc91cb2ba 100644 --- a/includes/SpecialNewpages.php +++ b/includes/SpecialNewpages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class NewPagesPage extends QueryPage { diff --git a/includes/SpecialPopularpages.php b/includes/SpecialPopularpages.php index 18dbb0d978bb..bed3b34289ca 100644 --- a/includes/SpecialPopularpages.php +++ b/includes/SpecialPopularpages.php @@ -1,6 +1,6 @@ <?php -include_once( "QueryPage.php" ); +require_once( "QueryPage.php" ); class PopularPagesPage extends QueryPage { diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php index 9581b8c52dc6..127678528581 100644 --- a/includes/SpecialRecentchanges.php +++ b/includes/SpecialRecentchanges.php @@ -1,6 +1,6 @@ <?php -include_once( "Feed.php" ); +require_once( "Feed.php" ); function wfSpecialRecentchanges( $par ) { diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php index 8c2f3ff97429..88cd47827d91 100644 --- a/includes/SpecialRecentchangeslinked.php +++ b/includes/SpecialRecentchangeslinked.php @@ -1,5 +1,5 @@ <?php -include_once( "SpecialRecentchanges.php" ); +require_once( "SpecialRecentchanges.php" ); function wfSpecialRecentchangeslinked( $par = NULL ) { diff --git a/includes/SpecialShortpages.php b/includes/SpecialShortpages.php index b9892772e68d..ae230239023f 100644 --- a/includes/SpecialShortpages.php +++ b/includes/SpecialShortpages.php @@ -1,6 +1,6 @@ <?php -include_once("QueryPage.php"); +require_once("QueryPage.php"); class ShortPagesPage extends QueryPage { diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php index 1a6e8a579914..b3f5f9a97c32 100644 --- a/includes/SpecialWantedpages.php +++ b/includes/SpecialWantedpages.php @@ -1,6 +1,6 @@ <?php -include_once ( "QueryPage.php" ) ; +require_once ( "QueryPage.php" ) ; class WantedPagesPage extends QueryPage { diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php index c98cd5f60281..619dc38445f9 100644 --- a/includes/SpecialWatchlist.php +++ b/includes/SpecialWatchlist.php @@ -1,6 +1,6 @@ <?php -include_once( "SpecialRecentchanges.php" ); -include_once( "WatchedItem.php" ); +require_once( "SpecialRecentchanges.php" ); +require_once( "WatchedItem.php" ); function wfSpecialWatchlist() { diff --git a/includes/UpdateClasses.php b/includes/UpdateClasses.php index a04734c5c39f..442de3737721 100644 --- a/includes/UpdateClasses.php +++ b/includes/UpdateClasses.php @@ -1,11 +1,11 @@ <?php # See deferred.doc -include_once( "UserUpdate.php" ); -include_once( "ViewCountUpdate.php" ); -include_once( "SiteStatsUpdate.php" ); -include_once( "LinksUpdate.php" ); -include_once( "SearchUpdate.php" ); -include_once( "UserTalkUpdate.php" ); -include_once( "SquidUpdate.php" ); +require_once( "UserUpdate.php" ); +require_once( "ViewCountUpdate.php" ); +require_once( "SiteStatsUpdate.php" ); +require_once( "LinksUpdate.php" ); +require_once( "SearchUpdate.php" ); +require_once( "UserTalkUpdate.php" ); +require_once( "SquidUpdate.php" ); ?> diff --git a/includes/User.php b/includes/User.php index b0a5afc85d6d..111bebff1a78 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1,7 +1,7 @@ <?php # See user.doc -include_once( "WatchedItem.php" ); +require_once( "WatchedItem.php" ); class User { /* private */ var $mId, $mName, $mPassword, $mEmail, $mNewtalk; @@ -151,7 +151,7 @@ class User { function SetupSession() { global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain; if( $wgSessionsInMemcached ) { - include_once( "MemcachedSessions.php" ); + require_once( "MemcachedSessions.php" ); } session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain ); session_cache_limiter( "private, must-revalidate" ); diff --git a/includes/UserMailer.php b/includes/UserMailer.php index f6097afcf88e..45e071c48808 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -12,7 +12,7 @@ function userMailer( $to, $from, $subject, $body ) if (is_array( $wgSMTP )) { - include_once( "Mail.php" ); + require_once( "Mail.php" ); $timestamp = time(); diff --git a/includes/killthread.php b/includes/killthread.php index d18bf9aadf0f..2598c6f75565 100644 --- a/includes/killthread.php +++ b/includes/killthread.php @@ -6,13 +6,13 @@ $wgCommandLineMode = true; unset( $IP ); ini_set( "allow_url_fopen", 0 ); # For security... -include_once( "./LocalSettings.php" ); +require_once( "./LocalSettings.php" ); # Windows requires ';' as separator, ':' for Unix $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( wfMsg( "badtitle" ) ); $wgArticle = new Article($wgTitle); diff --git a/index.php b/index.php index 7f66557c124f..916cb92bb6fb 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ ini_set( "allow_url_fopen", 0 ); # For security... if(!file_exists("LocalSettings.php")) { die( "You'll have to <a href='config/index.php'>set the wiki up</a> 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 bf96077cfb88..dec2020f5e70 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 0ba026cd799a..11555a2cf4cb 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 1d2932cfa036..4f5a7774c366 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 2b01b5ee02b7..95706cf9da84 100644 --- a/languages/LanguageAr.php +++ b/languages/LanguageAr.php @@ -1,6 +1,6 @@ <?php # See language.doc -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); /* private */ $wgNamespaceNamesAr = array( -2 => "ملف", diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php index 35019958fec1..19e32c2df953 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 6f711041bd67..357854e6197a 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 b23c382ca3e7..8c351ee2739f 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 2932c5a95665..fc1f781a268d 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 a847ae4ab241..5138e6992424 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 b5872e4c70e7..ef89ebf78b12 100644 --- a/languages/LanguageEl.php +++ b/languages/LanguageEl.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageEl extends LanguageUtf8 { function fallback8bitEncoding() { diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php index 0b8d699685c5..a2778b72793c 100644 --- a/languages/LanguageEo.php +++ b/languages/LanguageEo.php @@ -1,5 +1,5 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); $wgInputEncoding = "utf-8"; $wgOutputEncoding = "utf-8"; $wgEditEncoding = "x"; diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php index fd0d68a4eed0..9153f5b5b158 100644 --- a/languages/LanguageEt.php +++ b/languages/LanguageEt.php @@ -877,7 +877,7 @@ to move a page.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageEt extends LanguageUtf8 { diff --git a/languages/LanguageFa.php b/languages/LanguageFa.php index 90f6a18271cf..00cc74ebc9f3 100644 --- a/languages/LanguageFa.php +++ b/languages/LanguageFa.php @@ -2,7 +2,7 @@ # Wikipedia localization for Persian -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); #-------------------------------------------------------------------------- # Language-specific text diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php index aca54d7c78d9..b10be1660cf3 100644 --- a/languages/LanguageFi.php +++ b/languages/LanguageFi.php @@ -812,7 +812,7 @@ Näissä tapauksissa sivut täytyy siirtää tai yhdistää käsin.", "talkpagenotmoved" => "Artikkelin keskustelusivua <strong>ei</strong> siirretty.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageFi extends LanguageUtf8 { diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php index 482b04e1d475..1aa2c84dc217 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 9de585434c6c..96b56ef6b75a 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 1018a81386b9..886732c806c8 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 25a20e6a7600..c3ce75dfcdaa 100644 --- a/languages/LanguageHe.php +++ b/languages/LanguageHe.php @@ -1,6 +1,6 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageHi.php b/languages/LanguageHi.php index 2555de2b129e..9e52c34772a0 100644 --- a/languages/LanguageHi.php +++ b/languages/LanguageHi.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageHu.php b/languages/LanguageHu.php index 054f2458b47c..f90cee02ff31 100644 --- a/languages/LanguageHu.php +++ b/languages/LanguageHu.php @@ -1,6 +1,6 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageIa.php b/languages/LanguageIa.php index c3881b0556ed..d12914928786 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 8ac9ed42a495..1fbb3cc82b07 100644 --- a/languages/LanguageId.php +++ b/languages/LanguageId.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageMs.php" ); +require_once( "LanguageMs.php" ); class LanguageId extends LanguageMs { /* Inherit everything. */ diff --git a/languages/LanguageIt.php b/languages/LanguageIt.php index ab23eb6d6684..7db0bbb9ea18 100644 --- a/languages/LanguageIt.php +++ b/languages/LanguageIt.php @@ -782,7 +782,7 @@ Scegli, per cortesia, un titolo diverso per l'articolo.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageIt extends LanguageUtf8 { diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php index 6bbaad0cd8dd..adbdeafd1223 100644 --- a/languages/LanguageJa.php +++ b/languages/LanguageJa.php @@ -1,6 +1,6 @@ <?php global $IP; -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # The names of the namespaces can be set here, but the numbers # are magical, so don't change or move them! The Namespace class diff --git a/languages/LanguageKo.php b/languages/LanguageKo.php index be2200fbbd02..3f320116704d 100644 --- a/languages/LanguageKo.php +++ b/languages/LanguageKo.php @@ -1,6 +1,6 @@ <?php global $IP; -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # The names of the namespaces can be set here, but the numbers # are magical, so don't change or move them! The Namespace class diff --git a/languages/LanguageLa.php b/languages/LanguageLa.php index 048bb057c362..b724bee3b340 100644 --- a/languages/LanguageLa.php +++ b/languages/LanguageLa.php @@ -142,7 +142,7 @@ ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageLa extends LanguageUtf8 { diff --git a/languages/LanguageMl.php b/languages/LanguageMl.php index b90241640fae..14654d26e2ae 100644 --- a/languages/LanguageMl.php +++ b/languages/LanguageMl.php @@ -1,7 +1,7 @@ <?php # See language.doc -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageMl extends LanguageUtf8 { # Inherit everything diff --git a/languages/LanguageMs.php b/languages/LanguageMs.php index 80a3116c8e54..0df38ebf85bd 100644 --- a/languages/LanguageMs.php +++ b/languages/LanguageMs.php @@ -959,7 +959,7 @@ title. Please merge them manually.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageMs extends LanguageUtf8 { diff --git a/languages/LanguageNo.php b/languages/LanguageNo.php index 8259b8f83d6a..f61cf40a1546 100644 --- a/languages/LanguageNo.php +++ b/languages/LanguageNo.php @@ -1028,7 +1028,7 @@ med den nye tittelen. Du er nødt til å flette dem sammen manuelt.", ); -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageNo extends LanguageUtf8 { diff --git a/languages/LanguageOc.php b/languages/LanguageOc.php index 5c77d01caab4..c2249b8a8bfd 100644 --- a/languages/LanguageOc.php +++ b/languages/LanguageOc.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); // The names of the namespaces can be set here, but the numbers // are magical, so don't change or move them! The Namespace class diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php index 36dc61996ef9..76ef80b6642d 100644 --- a/languages/LanguagePl.php +++ b/languages/LanguagePl.php @@ -1,5 +1,5 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php index ce8ffd0411c7..8a07adda9443 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 520ee33d8ea0..64e03316f9f6 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -1,6 +1,6 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php index e445de444cee..b5e76c73582a 100644 --- a/languages/LanguageRu.php +++ b/languages/LanguageRu.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php index 6a9f2a7e72f5..6df1d6975bec 100644 --- a/languages/LanguageSk.php +++ b/languages/LanguageSk.php @@ -1,6 +1,6 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # Tu môžete meniť názvy "namespaces" (no proste, rôznych častí encyklopédie), # ale čísla nechajte tak, ako sú! Program to tak vyžaduje... diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php index 9d59ec621656..2e0f02708651 100644 --- a/languages/LanguageSl.php +++ b/languages/LanguageSl.php @@ -12,7 +12,7 @@ # 1.00.40 romanm 2003-11-21 | fixed Google search # -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageSq.php b/languages/LanguageSq.php index 5a103dd82972..237f76d432e8 100644 --- a/languages/LanguageSq.php +++ b/languages/LanguageSq.php @@ -1,6 +1,6 @@ <?php -include_once("LanguageUtf8.php"); +require_once("LanguageUtf8.php"); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageTa.php b/languages/LanguageTa.php index e97c117ff32d..94e6e0309430 100644 --- a/languages/LanguageTa.php +++ b/languages/LanguageTa.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); #-------------------------------------------------------------------------- # Language-specific text diff --git a/languages/LanguageTh.php b/languages/LanguageTh.php index 7b3ebc27201c..e36c9b7f5644 100644 --- a/languages/LanguageTh.php +++ b/languages/LanguageTh.php @@ -1075,7 +1075,7 @@ amusement.", # Internationalisation code #-------------------------------------------------------------------------- -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); class LanguageTh extends LanguageUtf8 { diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php index 47bd8cecd07d..0ade181e1aa1 100755 --- a/languages/LanguageUk.php +++ b/languages/LanguageUk.php @@ -1,6 +1,6 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/languages/LanguageUr.php b/languages/LanguageUr.php index bed070fd314c..06a879797937 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 b90468d6ef30..06d613a329d7 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 b451a5e1f137..60d8b93215dc 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 a863b91f019b..3f714cf81504 100644 --- a/languages/LanguageZh.php +++ b/languages/LanguageZh.php @@ -1,5 +1,5 @@ <?php -include_once( "LanguageUtf8.php" ); +require_once( "LanguageUtf8.php" ); # NOTE: To turn off "Current Events" in the sidebar, # set "currentevents" => "-" diff --git a/maintenance/DiffLanguage.php b/maintenance/DiffLanguage.php index 405820877952..7857635f43c2 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 e9bb785f74e7..4b330fa7f845 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 244bd1c6a12c..bcd49743501c 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 1027bb879660..cd32eb5fb5cc 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 1b9e659b4f53..56c2d2acb3ec 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 9c2d7dc062c6..b8e6b67891ed 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 10386b970a4e..2281e4331e1b 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 15e61958a841..ce93c6625e77 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 df147c1f8121..d3b88ddf9927 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 55eef53f0888..fefa962cdc0f 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 dad2b31b7ecf..e4c54601d0cc 100644 --- a/maintenance/dumpMessages.php +++ b/maintenance/dumpMessages.php @@ -1,5 +1,5 @@ <?php -include_once( "commandLine.inc" ); +require_once( "commandLine.inc" ); $messages = array(); foreach ( $wgAllMessagesEn as $key => $englishValue ) diff --git a/maintenance/importPhase2.php b/maintenance/importPhase2.php index e0c54b676c32..66c02d86dcf6 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 66fe6664a98b..a6b524916ac5 100755 --- a/maintenance/mcc.php +++ b/maintenance/mcc.php @@ -1,7 +1,7 @@ <?php -include_once( "../includes/DefaultSettings.php" ); -include_once( "../LocalSettings.php" ); -include_once( "../includes/MemCachedClient.inc.php" ); +require_once( "../includes/DefaultSettings.php" ); +require_once( "../LocalSettings.php" ); +require_once( "../includes/MemCachedClient.inc.php" ); $mcc = new MemCachedClient(); $mcc->set_servers( $wgMemCachedServers ); diff --git a/maintenance/rebuildMessages.php b/maintenance/rebuildMessages.php index d892f3717ce9..d97d16f452d9 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 a47e5083023a..a9d0a9760430 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 f03cd9afdeeb..bc4a291f976c 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 8949b76dbbaa..3ea838b613c7 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 7206d32aea24..e9366817292f 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 6177de62c0ea..089e6a70b5b0 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 74de741b9aa7..89a30033990e 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 8694e8151c57..6b69aee824dd 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 e210394eea15..150e01b47d7f 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" ); |