More rigorous fix for ImageMagick parameter interpretation (bug 23148 etc.) based...

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a8d10c5..5f20dea 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -309,6 +309,8 @@ $wgUrlProtocols = array(
        'mailto:',
        'news:',
        'svn://',
+       'git://',
+       'mms://',
 );
 
 /** internal name of virus scanner. This servers as a key to the $wgAntivirusSetup array.
@@ -462,9 +464,7 @@ $wgCacheSharedUploads = true;
 $wgAllowCopyUploads = false;
 
 /**
- * Max size for uploads, in bytes.  Currently only works for uploads from URL
- * via CURL (see $wgAllowCopyUploads).  The only way to impose limits on
- * normal uploads is currently to edit php.ini.
+ * Max size for uploads, in bytes. Applies to all uploads.
  */
 $wgMaxUploadSize = 1024*1024*100; # 100MB
 
@@ -639,11 +639,6 @@ $wgAllDBsAreLocalhost = false;
 
 /**@}*/
 
-
-/** Live high performance sites should disable this - some checks acquire giant mysql locks */
-$wgCheckDBSchema = true;
-
-
 /**
  * Shared database for multiple wikis. Commonly used for storing a user table
  * for single sign-on. The server for this database must be the same as for the
@@ -1126,7 +1121,7 @@ $wgShowIPinHeader = true; # For non-logged in users
 $wgMaxSigChars         = 255;  # Maximum number of Unicode characters in signature
 $wgMaxArticleSize      = 2048; # Maximum article size in kilobytes
 # Maximum number of bytes in username. You want to run the maintenance
-# script ./maintenancecheckUsernames.php once you have changed this value
+# script ./maintenance/checkUsernames.php once you have changed this value
 $wgMaxNameChars                = 255;
 
 $wgMaxPPNodeCount = 1000000;  # A complexity limit on template expansion
@@ -1465,6 +1460,7 @@ $wgGroupPermissions['sysop']['browsearchive']    = true;
 $wgGroupPermissions['sysop']['noratelimit']      = true;
 $wgGroupPermissions['sysop']['versiondetail']    = true;
 $wgGroupPermissions['sysop']['movefile']         = true;
+$wgGroupPermissions['sysop']['unblockself']      = true;
 #$wgGroupPermissions['sysop']['mergehistory']     = true;
 
 // Permission to change users' group assignments
@@ -1686,7 +1682,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '268';
+$wgStyleVersion = '274';
 
 
 # Server-side caching:
@@ -1913,6 +1909,16 @@ $wgAllowExternalImagesFrom = '';
  */
 $wgEnableImageWhitelist = true;
 
+/**
+ * A different approach to the above: simply allow the <img> tag to be used.
+ * This allows you to specify alt text and other attributes, copy-paste HTML to
+ * your wiki more easily, etc.  However, allowing external images in any manner
+ * will allow anyone with editing rights to snoop on your visitors' IP
+ * addresses and so forth, if they wanted to, by inserting links to images on
+ * sites they control.
+ */
+$wgAllowImageTag = false;
+
 /** Allows to move images and other media files */
 $wgAllowImageMoving = true;
 
@@ -1939,6 +1945,7 @@ $wgJobClasses = array(
        'sendMail' => 'EmaillingJob',
        'enotifNotify' => 'EnotifNotifyJob',
        'fixDoubleRedirect' => 'DoubleRedirectJob',
+       'uploadFromUrl' => 'UploadFromUrlJob',
 );
 
 /**
@@ -2351,11 +2358,11 @@ $wgSVGMaxSize = 2048;
 $wgMaxImageArea = 1.25e7;
 /**
  * Force thumbnailing of animated GIFs above this size to a single
- * frame instead of an animated thumbnail. ImageMagick seems to
- * get real unhappy and doesn't play well with resource limits. :P
- * Defaulting to 1 megapixel (1000x1000)
+ * frame instead of an animated thumbnail.  As of MW 1.17 this limit
+ * is checked against the total size of all frames in the animation.
+ * It probably makes sense to keep this equal to $wgMaxImageArea.
  */
-$wgMaxAnimatedGifArea = 1.0e6;
+$wgMaxAnimatedGifArea = 1.25e7;
 /**
  * Browsers don't support TIFF inline generally...
  * For inline display, we need to convert to PNG or JPEG.
@@ -2728,7 +2735,6 @@ $wgDefaultUserOptions = array(
        'editondblclick'          => 0,
        'editsection'             => 1,
        'editsectiononrightclick' => 0,
-       'editwidth'               => 0,
        'enotifminoredits'        => 0,
        'enotifrevealaddr'        => 0,
        'enotifusertalkpages'     => 1,
@@ -2905,6 +2911,13 @@ $wgAllowUserJs = false;
  */
 $wgAllowUserCss = false;
 
+/**
+ * Allow user-preferences implemented in CSS?
+ * This allows users to customise the site appearance to a greater
+ * degree; disabling it will improve page load times.
+ */
+$wgAllowUserCssPrefs = true;
+
 /** Use the site's Javascript page? */
 $wgUseSiteJs = true;
 
@@ -3322,6 +3335,11 @@ $wgLogActionsHandlers = array();
  */
 $wgNewUserLog = true;
 
+/**
+ * Log the automatic creations of new users accounts?
+ */
+$wgLogAutocreatedAccounts = false;
+
 /**
  * List of special pages, followed by what subtitle they should go under
  * at Special:SpecialPages