From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: 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 --- extensions/ParserFunctions/ParserFunctions.php | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'extensions/ParserFunctions/ParserFunctions.php') 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; } -- cgit v1.2.3-54-g00ecf