Merge "Actually make Parser::pstPass2() private"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 326a1c2..bb80beb 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1031,6 +1031,14 @@ $wgTiffThumbnailType = false;
  */
 $wgThumbnailEpoch = '20030516000000';
 
+/**
+ * Certain operations are avoided if there were too many recent failures,
+ * for example, thumbnail generation. Bump this value to invalidate all
+ * memory of failed operations and thus allow further attempts to resume.
+ * This is useful when a cause for the failures has been found and fixed.
+ */
+$wgAttemptFailureEpoch = 1;
+
 /**
  * If set, inline scaled images will still produce "<img>" tags ready for
  * output instead of showing an error message.
@@ -5429,13 +5437,6 @@ if ( !isset( $wgCommandLineMode ) ) {
  */
 $wgCommandLineDarkBg = false;
 
-/**
- * Array for extensions to register their maintenance scripts with the
- * system. The key is the name of the class and the value is the full
- * path to the file
- */
-$wgMaintenanceScripts = array();
-
 /**
  * Set this to a string to put the wiki into read-only mode. The text will be
  * used as an explanation to users.
@@ -5963,15 +5964,16 @@ $wgExtensionMessagesFiles = array();
  * @par Complex example:
  * @code
  *    $wgMessagesDirs['VisualEditor'] = array(
- *        __DIR__ . '/i18n',
- *        __DIR__ . '/modules/ve-core/i18n',
- *        __DIR__ . '/modules/qunit/localisation',
- *        __DIR__ . '/modules/oojs-ui/messages',
+ *        __DIR__ . '/lib/ve/modules/ve/i18n',
+ *        __DIR__ . '/modules/ve-mw/i18n',
+ *        __DIR__ . '/modules/ve-wmf/i18n',
  *    )
  * @endcode
  * @since 1.23
  */
-$wgMessagesDirs = array();
+$wgMessagesDirs = array(
+       "$IP/resources/oojs/i18n",
+);
 
 /**
  * Array of files with list(s) of extension entry points to be used in
@@ -6162,7 +6164,8 @@ $wgJobQueueAggregator = array(
  * Expensive Querypages are already updated.
  */
 $wgSpecialPageCacheUpdates = array(
-       'Statistics' => array( 'SiteStatsUpdate', 'cacheUpdate' )
+       'Statistics' => array( 'SiteStatsUpdate', 'cacheUpdate' ),
+       'Activeusers' => array( 'SpecialActiveUsers', 'cacheUpdate' ),
 );
 
 /**