Merge branch 'master' of https://gitlab.mpi-sws.org/sme/mediawiki-1.27.1

LocalSettings.php

@@ -140,7 +140,15 @@ wfLoadSkin( 'Vector' );
 #wfLoadExtension( 'ParserFunctions' );
 #wfLoadExtension( 'Scribunto' );
 
+#$wgVectorUseSimpleSearch = true;
+#$wgVectorUseIconWatch = true;
+
+#require_once "$IP/extensions/InputBox/InputBox.php";
+#require_once "$IP/extensions/TemplateData/TemplateData.php";
+
 require_once "$IP/extensions/ParserFunctions/ParserFunctions.php";
+$wgPFEnableStringFunctions = true;
+
 require_once "$IP/extensions/Scribunto/Scribunto.php";
 $wgScribuntoDefaultEngine = 'luastandalone';
 $wgScribuntoEngineConf['luastandalone']['luaPath'] = '/usr/bin/lua';
@@ -149,6 +157,7 @@ $wgScribuntoEngineConf['luastandalone']['luaPath'] = '/usr/bin/lua';
 #$wgScribuntoEngineConf['luastandalone']['errorFile'] = '/tmp/mwlua_error.log';
 ## lua debug log shows not enough memory
 #$wgScribuntoEngineConf['luastandalone']['memoryLimit'] = 524288000; # 500M in bytes
+#$wgScribuntoEngineConf['luastandalone']['cpuLimit'] = 60; # in seconds
 ##$wgScribuntoDefaultEngine = 'luasandbox';
 $wgMaxUploadSize = 32 * 1024 * 1024;
 $wgMaxArticleSize = 32 * 1024 * 1024;