(bug 16965) Follow-up to r45266, also don't record self-links, such as those created...

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d552699..e56713b 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.
  */
@@ -1238,7 +1247,6 @@ $wgGroupPermissions['sysop']['movefile']         = true;
 // Permission to change users' group assignments
 $wgGroupPermissions['bureaucrat']['userrights']  = true;
 $wgGroupPermissions['bureaucrat']['noratelimit'] = true;
-$wgGroupPermissions['bureaucrat']['interwiki']   = true;
 // Permission to change users' groups assignments across wikis
 #$wgGroupPermissions['bureaucrat']['userrights-interwiki'] = true;
 
@@ -1447,7 +1455,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '193';
+$wgStyleVersion = '196';
 
 
 # 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,
@@ -2794,7 +2810,6 @@ $wgLogTypes = array( '',
        'upload',
        'move',
        'import',
-       'interwiki',
        'patrol',
        'merge',
        'suppress',
@@ -2849,7 +2864,6 @@ $wgLogNames = array(
        'upload'  => 'uploadlogpage',
        'move'    => 'movelogpage',
        'import'  => 'importlogpage',
-       'interwiki' => 'interwikilogpage',
        'patrol'  => 'patrol-log-page',
        'merge'   => 'mergelog',
        'suppress' => 'suppressionlog',
@@ -2870,7 +2884,6 @@ $wgLogHeaders = array(
        'upload'  => 'uploadlogpagetext',
        'move'    => 'movelogpagetext',
        'import'  => 'importlogpagetext',
-       'interwiki' => 'interwikilogpagetext',
        'patrol'  => 'patrol-log-header',
        'merge'   => 'mergelogpagetext',
        'suppress' => 'suppressionlogtext',
@@ -2902,10 +2915,6 @@ $wgLogActions = array(
        'move/move_redir'   => '1movedto2_redir',
        'import/upload'     => 'import-logentry-upload',
        'import/interwiki'  => 'import-logentry-interwiki',
-       'interwiki/interwiki' => 'interwiki_logentry',
-       'interwiki/iw_add' => 'interwiki_log_added',
-       'interwiki/iw_delete' => 'interwiki_log_deleted',
-       'interwiki/iw_edit' => 'interwiki_log_edited',
        'merge/merge'       => 'pagemerge-logentry',
        'suppress/revision' => 'revdelete-logentry',
        'suppress/file'     => 'revdelete-logentry',
@@ -2967,7 +2976,7 @@ $wgSpecialPageGroups = array(
        'Log'                       => 'changes',
 
        'Upload'                    => 'media',
-       'Imagelist'                 => 'media',
+       'Listfiles'                 => 'media',
        'MIMEsearch'                => 'media',
        'FileDuplicateSearch'       => 'media',
        'Filepath'                  => 'media',
@@ -3024,7 +3033,6 @@ $wgSpecialPageGroups = array(
        'Specialpages'              => 'other',
        'Blockme'                   => 'other',
        'Booksources'               => 'other',
-       'Interwiki'                 => 'other',
 );
 
 /**
@@ -3633,12 +3641,6 @@ $wgEdititis = false;
 */
 $wgUniversalEditButton = true;
 
-/**
-* Enable the Interwiki special page. 
-* Disable for wikis that have their interwiki table updated automatically from a central location (like Wikimedia)
-*/
-$wgEnableSpecialInterwiki = true;
-
 /**
  * Allow id's that don't conform to HTML4 backward compatibility requirements.
  * This is currently for testing; if all goes well, this option will be removed