(bug 13718) Return the proper continue parameter for cmsort=timestamp

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6977b8b..97ff9a2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -461,7 +461,6 @@ $wgHashedSharedUploadDirectory = true;
  */
 $wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/Image:";
 
-
 #
 # Email settings
 #
@@ -565,6 +564,13 @@ $wgDBprefix         = '';
 /** MySQL table options to use during installation or update */
 $wgDBTableOptions = 'TYPE=InnoDB';
 
+/**
+ * Make all database connections secretly go to localhost. Fool the load balancer
+ * thinking there is an arbitrarily large cluster of servers to connect to. 
+ * Useful for debugging.
+ */
+$wgAllDBsAreLocalhost = false;
+
 /**#@-*/
 
 
@@ -700,7 +706,6 @@ $wgParserCacheType = CACHE_ANYTHING;
 $wgParserCacheExpireTime = 86400;
 
 $wgSessionsInMemcached = false;
-$wgLinkCacheMemcached = false; # Not fully tested
 
 /**
  * Memcached-specific settings
@@ -1152,9 +1157,16 @@ $wgGroupPermissions['bureaucrat']['userrights']  = true;
 // Permission to change users' groups assignments across wikis
 #$wgGroupPermissions['bureaucrat']['userrights-interwiki'] = true;
 
-// Experimental permissions, not ready for production use
-//$wgGroupPermissions['sysop']['deleterevision'] = true;
-//$wgGroupPermissions['bureaucrat']['hiderevision'] = true;
+#$wgGroupPermissions['sysop']['deleterevision']  = true;
+// To hide usernames
+#$wgGroupPermissions['suppress']['hideuser'] = true;
+// To see hidden revs and unhide revs hidden from Sysops
+#$wgGroupPermissions['suppress']['hiderevision'] = true;
+// For private log access
+#$wgGroupPermissions['suppress']['suppress'] = true;
+
+// Pending WMF schema change...temporary variable
+$wgAllowLogDeletion = false;
 
 /**
  * The developer group is deprecated, but can be activated if need be
@@ -1324,7 +1336,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '127';
+$wgStyleVersion = '134';
 
 
 # Server-side caching:
@@ -1391,7 +1403,7 @@ $wgEnotifUseJobQ = false;
 /** 
  * Array of usernames who will be sent a notification email for every change which occurs on a wiki
  */
-$wgUsersNotifedOnAllChanges = array();
+$wgUsersNotifiedOnAllChanges = array();
 
 /** Show watching users in recent changes, watchlist and page history views */
 $wgRCShowWatchingUsers                                 = false; # UPO
@@ -1399,6 +1411,8 @@ $wgRCShowWatchingUsers                            = false; # UPO
 $wgPageShowWatchingUsers                       = false;
 /** Show the amount of changed characters in recent changes */
 $wgRCShowChangedSize                           = true;
+/** Logs that are grouped by log type, not page */
+$wgRCTypeGroupedLogs = array( 'block', 'rights' );
 
 /**
  * If the difference between the character counts of the text
@@ -1483,6 +1497,9 @@ $wgCookiePath = '/';
 $wgCookieSecure = ($wgProto == 'https');
 $wgDisableCookieCheck = false;
 
+/** A list of cookies that vary the cache (for use by extensions) */
+$wgCacheVaryCookies = array();
+
 /** Override to customise the session name */
 $wgSessionName = false;
 
@@ -2394,6 +2411,17 @@ $wgLogTypes = array( '',
        'import',
        'patrol',
        'merge',
+       'suppress',
+);
+
+/**
+ * This restricts log access to those who have a certain right
+ * Users without this will not see it in the option menu and can not view it
+ * Restricted logs are not added to recent changes
+ * Logs should remain non-transcludable
+ */
+$wgLogRestrictions = array(
+       'suppress' => 'suppress'
 );
 
 /**
@@ -2413,6 +2441,7 @@ $wgLogNames = array(
        'import'  => 'importlogpage',
        'patrol'  => 'patrol-log-page',
        'merge'   => 'mergelog',
+       'suppress' => 'suppressionlog',
 );
 
 /**
@@ -2432,6 +2461,7 @@ $wgLogHeaders = array(
        'import'  => 'importlogpagetext',
        'patrol'  => 'patrol-log-header',
        'merge'   => 'mergelogpagetext',
+       'suppress' => 'suppressionlogtext',
 );
 
 /**
@@ -2450,6 +2480,7 @@ $wgLogActions = array(
        'delete/delete'     => 'deletedarticle',
        'delete/restore'    => 'undeletedarticle',
        'delete/revision'   => 'revdelete-logentry',
+       'delete/event'      => 'logdelete-logentry',
        'upload/upload'     => 'uploadedimage',
        'upload/overwrite'  => 'overwroteimage',
        'upload/revert'     => 'uploadedimage',
@@ -2458,6 +2489,11 @@ $wgLogActions = array(
        'import/upload'     => 'import-logentry-upload',
        'import/interwiki'  => 'import-logentry-interwiki',
        'merge/merge'       => 'pagemerge-logentry',
+       'suppress/revision' => 'revdelete-logentry',
+       'suppress/file'     => 'revdelete-logentry',
+       'suppress/event'    => 'logdelete-logentry',
+       'suppress/delete'   => 'suppressedarticle',
+       'suppress/block'        => 'blocklogentry',
 );
 
 /**
@@ -2637,6 +2673,7 @@ $wgExternalStores = false;
 /**
  * An array of external mysql servers, e.g.
  * $wgExternalServers = array( 'cluster1' => array( 'srv28', 'srv29', 'srv30' ) );
+ * Used by LBFactory_Simple, may be ignored if $wgLBFactoryConf is set to another class.
  */
 $wgExternalServers = array();
 
@@ -2967,3 +3004,9 @@ $wgPagePropLinkInvalidations = array(
  * Special:Whatlinkshere/RedirectDestination
  */
 $wgMaxRedirectLinksRetrieved = 500;
+
+/**
+* Maximum number of calls to expensive parser functions
+* such as PAGESINCATEGORY.
+*/
+$wgExpensiveParserFunctionLimit = 100;