diff options
Diffstat (limited to 'includes/Defines.php')
| -rw-r--r-- | includes/Defines.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/includes/Defines.php b/includes/Defines.php index 017e9ea4..c9263da9 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -2,10 +2,6 @@ /** * A few constants that might be needed during LocalSettings.php. * - * Note: these constants must all be resolvable at compile time by HipHop, - * since this file will not be executed during request startup for a compiled - * MediaWiki. - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -152,12 +148,13 @@ define( 'AV_SCAN_FAILED', false ); #scan failed (scanner not found or error in /**@{ * Anti-lock flags - * See DefaultSettings.php for a description + * Was used by $wgAntiLockFlags, which was removed with 1.25 + * Constants kept to not have warnings when used in LocalSettings */ define( 'ALF_PRELOAD_LINKS', 1 ); // unused define( 'ALF_PRELOAD_EXISTENCE', 2 ); // unused -define( 'ALF_NO_LINK_LOCK', 4 ); -define( 'ALF_NO_BLOCK_LOCK', 8 ); +define( 'ALF_NO_LINK_LOCK', 4 ); // unused +define( 'ALF_NO_BLOCK_LOCK', 8 ); // unused /**@}*/ /**@{ @@ -206,15 +203,15 @@ define( 'LIST_OR', 4 ); /** * Unicode and normalisation related */ -require_once __DIR__ . '/normal/UtfNormalDefines.php'; +require_once __DIR__ . '/libs/normal/UtfNormalDefines.php'; /**@{ * Hook support constants */ -define( 'MW_SUPPORTS_EDITFILTERMERGED', 1 ); define( 'MW_SUPPORTS_PARSERFIRSTCALLINIT', 1 ); define( 'MW_SUPPORTS_LOCALISATIONCACHE', 1 ); define( 'MW_SUPPORTS_CONTENTHANDLER', 1 ); +define( 'MW_EDITFILTERMERGED_SUPPORTS_API', 1 ); /**@}*/ /** Support for $wgResourceModules */ @@ -223,6 +220,12 @@ define( 'MW_SUPPORTS_RESOURCE_MODULES', 1 ); /**@{ * Allowed values for Parser::$mOutputType * Parameter to Parser::startExternalParse(). + * Use of Parser consts is preferred: + * - Parser::OT_HTML + * - Parser::OT_WIKI + * - Parser::OT_PREPROCESS + * - Parser::OT_MSG + * - Parser::OT_PLAIN */ define( 'OT_HTML', 1 ); define( 'OT_WIKI', 2 ); @@ -233,16 +236,14 @@ define( 'OT_PLAIN', 4 ); /**@{ * Flags for Parser::setFunctionHook + * Use of Parser consts is preferred: + * - Parser::SFH_NO_HASH + * - Parser::SFH_OBJECT_ARGS */ define( 'SFH_NO_HASH', 1 ); define( 'SFH_OBJECT_ARGS', 2 ); /**@}*/ -/** - * Flags for Parser::replaceLinkHolders - */ -define( 'RLH_FOR_UPDATE', 1 ); - /**@{ * Autopromote conditions (must be here and not in Autopromote.php, so that * they're loaded for DefaultSettings.php before AutoLoader.php) |