Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move libs/time/defines.php inclusion from GlobalFunctions to Defines.php

Browse source 
* Verified none of these constants depend on each other.
* Move them to the top of Defines.php for consistency.

Change-Id: I19c77e706d69bff513e4abafd0300207de0dbb1d
This commit is contained in:
Timo Tijhof 2017-01-12 16:46:25 -08:00 committed by Krinkle
parent 72a02ed1b8
commit 34060273e7
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/Defines.php
View file

@ -20,6 +20,11 @@
* @file
*/
require_once __DIR__ . '/libs/mime/defines.php';
require_once __DIR__ . '/libs/time/defines.php';
require_once __DIR__ . '/libs/rdbms/defines.php';
require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
/**
* @defgroup Constants MediaWiki constants
*/
@ -97,8 +102,6 @@ define( 'CACHE_MEMCACHED', 2 ); // MemCached, must specify servers in $wgMemCac
define( 'CACHE_ACCEL', 3 ); // APC, XCache or WinCache
/**@}*/
require_once __DIR__ . '/libs/mime/defines.php';
/**@{
* Antivirus result codes, for use in $wgAntivirusSetup.
*/
@ -153,16 +156,6 @@ define( 'EDIT_AUTOSUMMARY', 64 );
define( 'EDIT_INTERNAL', 128 );
/**@}*/
/**
* Database related
*/
require_once __DIR__ . '/libs/rdbms/defines.php';
/**
* Unicode and normalisation related
*/
require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
/**@{
* Hook support constants
*/

4
includes/GlobalFunctions.php
View file

@ -1999,10 +1999,6 @@ function wfRestoreWarnings() {
MediaWiki\suppressWarnings( true );
}
# Autodetect, convert and provide timestamps of various types
require_once __DIR__ . '/libs/time/defines.php';
/**
* Get a timestamp string in one of various formats
*