Bump style version for r39776.

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 020c1af..4630b23 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 = '167';
 
 
 # Server-side caching:
@@ -1471,7 +1471,7 @@ $wgRCChangedSizeThreshold                 = -500;
 $wgShowUpdatedMarker                           = true;
 
 /**
- * Default cookie expiration time. Setting to 0 disables makes all cookies session-only.
+ * Default cookie expiration time. Setting to 0 makes all cookies session-only.
  */
 $wgCookieExpiration = 30*86400;
 
@@ -2095,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
@@ -2198,7 +2206,6 @@ $wgDefaultUserOptions = array(
        'contextlines'            => 5,
        'contextchars'            => 50,
        'disablesuggest'          => 0,
-       'ajaxsearch'              => 0,
        'skin'                    => false,
        'math'                    => 1,
        'usenewrc'                => 0,
@@ -3119,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