Tweaks for SiteConfiguration:

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 692e1ff..9fc302d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1382,7 +1382,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '166';
+$wgStyleVersion = '169';
 
 
 # Server-side caching:
@@ -1470,6 +1470,9 @@ $wgRCChangedSizeThreshold                 = -500;
  * view for watched pages with new changes */
 $wgShowUpdatedMarker                           = true;
 
+/**
+ * Default cookie expiration time. Setting to 0 makes all cookies session-only.
+ */
 $wgCookieExpiration = 30*86400;
 
 /** Clock skew or the one-second resolution of time() can occasionally cause cache
@@ -1556,11 +1559,6 @@ $wgCookiePrefix = false;
  */
 $wgCookieHttpOnly = version_compare("5.2", PHP_VERSION, "<");
 
-/**
- * Allow MediaWiki to set persistent cookies for login, etc.
- */
-$wgEnablePersistentCookies = true;
-
 /**
  * If the requesting browser matches a regex in this blacklist, we won't
  * send it cookies with HttpOnly mode, even if $wgCookieHttpOnly is on.
@@ -1808,7 +1806,7 @@ $wgMimeTypeBlacklist= array(
        'text/x-python', 'text/x-perl', 'text/x-bash', 'text/x-sh', 'text/x-csh',
        # Windows metafile, client-side vulnerability on some systems
        'application/x-msmetafile',
-       # A ZIP file may be a valid Java archive containing an applet which exploits the 
+       # A ZIP file may be a valid Java archive containing an applet which exploits the
        # same-origin policy to steal cookies
        'application/zip',
 );
@@ -2097,9 +2095,17 @@ $wgExportMaxHistory = 0;
 $wgExportAllowListContributors = false ;
 
 
-/** Text matching this regular expression will be recognised as spam
- * See http://en.wikipedia.org/wiki/Regular_expression */
-$wgSpamRegex = false;
+/**
+ * Edits matching these regular expressions in body text or edit summary
+ * will be recognised as spam and rejected automatically.
+ *
+ * There's no administrator override on-wiki, so be careful what you set. :)
+ * May be an array of regexes or a single string for backwards compatibility.
+ *
+ * See http://en.wikipedia.org/wiki/Regular_expression
+ */
+$wgSpamRegex = array();
+
 /** Similarly you can get a function to do the job. The function will be given
  * the following args:
  *   - a Title object for the article the edit is made on
@@ -2200,7 +2206,6 @@ $wgDefaultUserOptions = array(
        'contextlines'            => 5,
        'contextchars'            => 50,
        'disablesuggest'          => 0,
-       'ajaxsearch'              => 0,
        'skin'                    => false,
        'math'                    => 1,
        'usenewrc'                => 0,
@@ -2407,7 +2412,7 @@ $wgFeedCacheTimeout = 60;
 $wgFeedDiffCutoff = 32768;
 
 /** Override the site's default RSS/ATOM feed for recentchanges that appears on
- * every page. Some sites might have a different feed they'd like to promote 
+ * every page. Some sites might have a different feed they'd like to promote
  * instead of the RC feed (maybe like a "Recent New Articles" or "Breaking news" one).
  * Ex: $wgSiteFeed['format'] = "http://example.com/somefeed.xml"; Format can be one
  * of either 'rss' or 'atom'.
@@ -3121,13 +3126,6 @@ $wgUpdateRowsPerQuery = 10;
  */
 $wgUseAjax = true;
 
-/**
- * Enable auto suggestion for the search bar
- * Requires $wgUseAjax to be true too.
- * Causes wfSajaxSearch to be added to $wgAjaxExportList
- */
-$wgAjaxSearch = false;
-
 /**
  * List of Ajax-callable functions.
  * Extensions acting as Ajax callbacks must register here
@@ -3157,7 +3155,7 @@ $wgAjaxLicensePreview = true;
 $wgAllowDisplayTitle = true;
 
 /**
- * for consistency, restrict DISPLAYTITLE to titles that normalize to the same canonical DB key 
+ * for consistency, restrict DISPLAYTITLE to titles that normalize to the same canonical DB key
  */
 $wgRestrictDisplayTitle = true;