Add $wgAllowUserCssPrefs option to disable CSS-based preferences. These are injected...

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2108533..8f47cd1 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1686,7 +1686,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '267';
+$wgStyleVersion = '268';
 
 
 # Server-side caching:
@@ -2716,72 +2716,72 @@ $wgHandheldForIPhone = false;
  *
  */
 $wgDefaultUserOptions = array(
-       'quickbar'                => 1,
-       'underline'               => 2,
+       'ccmeonemails'            => 0,
        'cols'                    => 80,
-       'rows'                    => 25,
-       'searchlimit'             => 20,
-       'contextlines'            => 5,
        'contextchars'            => 50,
+       'contextlines'            => 5,
+       'date'                    => 'default',
+       'diffonly'                => 0,
+       'disablemail'             => 0,
        'disablesuggest'          => 0,
-       'skin'                    => false,
-       'math'                    => 1,
-       'usenewrc'                => 0,
-       'rcdays'                  => 7,
-       'rclimit'                 => 50,
-       'wllimit'                 => 250,
-       'hideminor'               => 0,
-       'hidepatrolled'           => 0,
-       'newpageshidepatrolled'   => 0,
-       'highlightbroken'         => 1,
-       'stubthreshold'           => 0,
-       'previewontop'            => 1,
-       'previewonfirst'          => 0,
+       'editfont'                => 'default',
+       'editondblclick'          => 0,
        'editsection'             => 1,
        'editsectiononrightclick' => 0,
-       'editondblclick'          => 0,
        'editwidth'               => 0,
-       'showtoc'                 => 1,
-       'showtoolbar'             => 1,
-       'minordefault'            => 0,
-       'date'                    => 'default',
-       'imagesize'               => 2,
-       'thumbsize'               => 2,
-       'rememberpassword'        => 0,
-       'nocache'                 => 0,
-       'diffonly'                => 0,
-       'showhiddencats'          => 0,
-       'norollbackdiff'          => 0,
-       'enotifwatchlistpages'    => 0,
-       'enotifusertalkpages'     => 1,
        'enotifminoredits'        => 0,
        'enotifrevealaddr'        => 0,
-       'shownumberswatching'     => 1,
-       'fancysig'                => 0,
-       'externaleditor'          => 0,
+       'enotifusertalkpages'     => 1,
+       'enotifwatchlistpages'    => 0,
+       'extendwatchlist'         => 0,
        'externaldiff'            => 0,
+       'externaleditor'          => 0,
+       'fancysig'                => 0,
        'forceeditsummary'        => 0,
-       'showjumplinks'           => 1,
+       'gender'                  => 'unknown',
+       'hideminor'               => 0,
+       'hidepatrolled'           => 0,
+       'highlightbroken'         => 1,
+       'imagesize'               => 2,
        'justify'                 => 0,
+       'math'                    => 1,
+       'minordefault'            => 0,
+       'newpageshidepatrolled'   => 0,
+       'nocache'                 => 0,
+       'noconvertlink'           => 0,
+       'norollbackdiff'          => 0,
        'numberheadings'          => 0,
+       'previewonfirst'          => 0,
+       'previewontop'            => 1,
+       'quickbar'                => 1,
+       'rcdays'                  => 7,
+       'rclimit'                 => 50,
+       'rememberpassword'        => 0,
+       'rows'                    => 25,
+       'searchlimit'             => 20,
+       'showhiddencats'          => 0,
+       'showjumplinks'           => 1,
+       'shownumberswatching'     => 1,
+       'showtoc'                 => 1,
+       'showtoolbar'             => 1,
+       'skin'                    => false,
+       'stubthreshold'           => 0,
+       'thumbsize'               => 2,
+       'underline'               => 2,
        'uselivepreview'          => 0,
+       'usenewrc'                => 0,
+       'watchcreations'          => 0,
+       'watchdefault'            => 0,
+       'watchdeletion'           => 0,
        'watchlistdays'           => 3.0,
-       'extendwatchlist'         => 0,
-       'watchlisthideminor'      => 0,
-       'watchlisthidebots'       => 0,
-       'watchlisthideown'        => 0,
        'watchlisthideanons'      => 0,
+       'watchlisthidebots'       => 0,
        'watchlisthideliu'        => 0,
+       'watchlisthideminor'      => 0,
+       'watchlisthideown'        => 0,
        'watchlisthidepatrolled'  => 0,
-       'watchcreations'          => 0,
-       'watchdefault'            => 0,
        'watchmoves'              => 0,
-       'watchdeletion'           => 0,
-       'noconvertlink'           => 0,
-       'gender'                  => 'unknown',
-       'ccmeonemails'            => 0,
-       'disablemail'             => 0,
-       'editfont'                => 'default',
+       'wllimit'                 => 250,
 );
 
 /**
@@ -2905,6 +2905,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;
 
@@ -3040,29 +3047,16 @@ $wgThumbLimits = array(
 $wgThumbUpright = 0.75;
 
 /**
- * Adjust the default number of images per-row in the gallery.
- */
-$wgGalleryImagesPerRow = 3;
-
-/**
- * Adjust the width of the cells containing images in galleries (in "px")
- */
-$wgGalleryImageWidth = 200;
-
-/**
- * Adjust the height of the cells containing images in galleries (in "px")
+ * Default parameters for the <gallery> tag
  */
-$wgGalleryImageHeight = 200;
 
-/**
- * The length of caption to truncate to by default (in characters)
- */
-$wgGalleryCaptionLength = 10;
-
-/**
- * Should the gallerys in categoryes show the filesize in bytes?
- */
-$wgGalleryShowBytes = true;
+$wgGalleryOptions = array (
+       'imagesPerRow' => 4, // Default number of images per-row in the gallery
+       'imageWidth' => 120, // Width of the cells containing images in galleries (in "px")
+       'imageHeight' => 120, // Height of the cells containing images in galleries (in "px")
+       'captionLength' => 20, // Length of caption to truncate (in characters)
+       'showBytes' => true, // Show the filesize in bytes in categories
+);
 
 /**
  *  On  category pages, show thumbnail gallery for images belonging to that
@@ -3321,6 +3315,7 @@ $wgLogActions = array(
        'suppress/delete'   => 'suppressedarticle',
        'suppress/block'        => 'blocklogentry',
        'suppress/reblock'  => 'reblock-logentry',
+       'patrol/patrol'         => 'patrol-log-line',
 );
 
 /**