summaryrefslogtreecommitdiff
path: root/extensions/ParserFunctions/ParserFunctions.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /extensions/ParserFunctions/ParserFunctions.php
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'extensions/ParserFunctions/ParserFunctions.php')
-rw-r--r--extensions/ParserFunctions/ParserFunctions.php25
1 files changed, 1 insertions, 24 deletions
diff --git a/extensions/ParserFunctions/ParserFunctions.php b/extensions/ParserFunctions/ParserFunctions.php
index fc28ece8..ef2ad8d3 100644
--- a/extensions/ParserFunctions/ParserFunctions.php
+++ b/extensions/ParserFunctions/ParserFunctions.php
@@ -29,23 +29,6 @@ $wgPFStringLengthLimit = 1000;
*/
$wgPFEnableStringFunctions = false;
-/**
- * Enable Convert parser for converting between units of measurement
- */
-$wgPFEnableConvert = false;
-
-/**
- * The language for 'en' is actually 'en-us', which insists on using non-canonical translations
- * of the SI base units ("meter" rather than "metre" and "liter" rather than "litre"). We
- * can avoid contaminatng dialects by internally mapping languages by default; this is
- * configurable so you can remove it if you like, or add other maps if that's useful.
- * Essentially, if your wiki's $wgContLang appears as a key in this array, the value is
- * what is used as the default language for {{#convert}} output.
- */
-$wgPFUnitLanguageVariants = array(
- 'en' => 'en-gb'
-);
-
/** REGISTRATION */
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
@@ -58,14 +41,12 @@ $wgExtensionCredits['parserhook'][] = array(
$wgAutoloadClasses['ExtParserFunctions'] = dirname( __FILE__ ) . '/ParserFunctions_body.php';
$wgAutoloadClasses['ExprParser'] = dirname( __FILE__ ) . '/Expr.php';
-$wgAutoloadClasses['ConvertParser'] = dirname( __FILE__ ) . '/Convert.php';
$wgExtensionMessagesFiles['ParserFunctions'] = dirname( __FILE__ ) . '/ParserFunctions.i18n.php';
$wgExtensionMessagesFiles['ParserFunctionsMagic'] = dirname( __FILE__ ) . '/ParserFunctions.i18n.magic.php';
$wgParserTestFiles[] = dirname( __FILE__ ) . "/funcsParserTests.txt";
$wgParserTestFiles[] = dirname( __FILE__ ) . "/stringFunctionTests.txt";
-$wgParserTestFiles[] = dirname( __FILE__ ) . "/convertTests.txt";
$wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
@@ -74,7 +55,7 @@ $wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
* @return bool
*/
function wfRegisterParserFunctions( $parser ) {
- global $wgPFEnableStringFunctions, $wgPFEnableConvert;
+ global $wgPFEnableStringFunctions;
// These functions accept DOM-style arguments
$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
@@ -102,9 +83,5 @@ function wfRegisterParserFunctions( $parser ) {
$parser->setFunctionHook( 'urldecode', 'ExtParserFunctions::runUrlDecode' );
}
- if( $wgPFEnableConvert ) {
- $parser->setFunctionHook( 'convert', 'ExtParserFunctions::convert' );
- }
-
return true;
}