Redid r45389 "Disallow broken Talk:File:x type titles (bug 5280)"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 87d6e3d..d849910 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ if ( !defined( 'MW_PHP4' ) ) {
 }
 
 /** MediaWiki version number */
-$wgVersion                     = '1.14alpha';
+$wgVersion                     = '1.15alpha';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
@@ -224,6 +224,10 @@ $wgFileStore['deleted']['hash'] = 3;         ///< 3-level subdirectory split
  *                      equivalent to the corresponding member of $wgDBservers
  *    tablePrefix       Table prefix, the foreign wiki's $wgDBprefix
  *    hasSharedCache    True if the wiki's shared cache is accessible via the local $wgMemc
+ * 
+ * ForeignAPIRepo:
+ *    apibase              Use for the foreign API's URL
+ *    apiThumbCacheExpiry  How long to locally cache thumbs for
  *
  * The default is to initialise these arrays from the MW<1.11 backwards compatible settings:
  * $wgUploadPath, $wgThumbnailScriptPath, $wgSharedUploadDirectory, etc.
@@ -520,6 +524,11 @@ $wgUserEmailUseReplyTo = false;
  */
 $wgPasswordReminderResendTime = 24;
 
+/**
+ * The time, in seconds, when an emailed temporary password expires.
+ */
+$wgNewPasswordExpiry  = 3600 * 24 * 7;
+
 /**
  * SMTP Mode
  * For using a direct (authenticated) SMTP server connection.
@@ -970,7 +979,7 @@ $wgSiteSupportPage  = ''; # A page where you users can receive donations
 $wgReadOnly             = null;
 
 /***
- * If this lock file exists, the wiki will be forced into read-only mode.
+ * If this lock file exists (size > 0), the wiki will be forced into read-only mode.
  * Its contents will be shown to users as part of the read-only warning
  * message.
  */
@@ -1232,7 +1241,6 @@ $wgGroupPermissions['sysop']['markbotedits']     = true;
 $wgGroupPermissions['sysop']['apihighlimits']    = true;
 $wgGroupPermissions['sysop']['browsearchive']    = true;
 $wgGroupPermissions['sysop']['noratelimit']      = true;
-$wgGroupPermissions['sysop']['restrict']         = true;
 $wgGroupPermissions['sysop']['movefile']         = true;
 #$wgGroupPermissions['sysop']['mergehistory']     = true;
 
@@ -1447,7 +1455,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '193';
+$wgStyleVersion = '197';
 
 
 # Server-side caching:
@@ -2390,6 +2398,10 @@ $wgDefaultUserOptions = array(
        'imagesize'               => 2,
        'thumbsize'               => 2,
        'rememberpassword'        => 0,
+       'nocache'                 => 0,
+       'diffonly'                => 0,
+       'showhiddencats'          => 0,
+       'norollbackdiff'          => 0,
        'enotifwatchlistpages'    => 0,
        'enotifusertalkpages'     => 1,
        'enotifminoredits'        => 0,
@@ -2398,7 +2410,9 @@ $wgDefaultUserOptions = array(
        'fancysig'                => 0,
        'externaleditor'          => 0,
        'externaldiff'            => 0,
+       'forceeditsummary'        => 0,
        'showjumplinks'           => 1,
+       'justify'                 => 0,
        'numberheadings'          => 0,
        'uselivepreview'          => 0,
        'watchlistdays'           => 3.0,
@@ -2406,6 +2420,8 @@ $wgDefaultUserOptions = array(
        'watchlisthideminor'      => 0,
        'watchlisthidebots'       => 0,
        'watchlisthideown'        => 0,
+       'watchlisthideanons'      => 0,
+       'watchlisthideliu'        => 0,
        'watchcreations'          => 0,
        'watchdefault'            => 0,
        'watchmoves'              => 0,
@@ -2797,7 +2813,6 @@ $wgLogTypes = array( '',
        'patrol',
        'merge',
        'suppress',
-       'restrict',
 );
 
 /**
@@ -2852,7 +2867,6 @@ $wgLogNames = array(
        'patrol'  => 'patrol-log-page',
        'merge'   => 'mergelog',
        'suppress' => 'suppressionlog',
-       'restrict' => 'restrictionlog',
 );
 
 /**
@@ -2873,7 +2887,6 @@ $wgLogHeaders = array(
        'patrol'  => 'patrol-log-header',
        'merge'   => 'mergelogpagetext',
        'suppress' => 'suppressionlogtext',
-       'restrict' => 'restrictionlogtext',
 );
 
 /**
@@ -2909,8 +2922,6 @@ $wgLogActions = array(
        'suppress/delete'   => 'suppressedarticle',
        'suppress/block'        => 'blocklogentry',
        'suppress/reblock'  => 'reblock-logentry',
-       'restrict/restrict' => 'restrictentry',
-       'restrict/remove'   => 'restrictremoveentry',
 );
 
 /**
@@ -2965,7 +2976,7 @@ $wgSpecialPageGroups = array(
        'Log'                       => 'changes',
 
        'Upload'                    => 'media',
-       'Imagelist'                 => 'media',
+       'Listfiles'                 => 'media',
        'MIMEsearch'                => 'media',
        'FileDuplicateSearch'       => 'media',
        'Filepath'                  => 'media',
@@ -2982,8 +2993,6 @@ $wgSpecialPageGroups = array(
        'Preferences'               => 'users',
        'Resetpass'                 => 'users',
        'DeletedContributions'      => 'users',
-       'ListUserRestrictions'      => 'users',
-       'RestrictUser'              => 'users',
 
        'Mostlinked'                => 'highuse',
        'Mostlinkedcategories'      => 'highuse',