Branch merge of preferences work branch. Includes fixes for several bugs. WARNING...

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c541371..2b29744 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1477,7 +1477,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '212';
+$wgStyleVersion = '213';
 
 
 # Server-side caching:
@@ -2497,6 +2497,7 @@ $wgDefaultUserOptions = array(
        'watchdeletion'           => 0,
        'noconvertlink'           => 0,
        'gender'                  => 'unknown',
+       'ccmeonemails'            => 0,
 );
 
 /** Whether or not to allow and use real name fields. Defaults to true. */