X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=0a238a829f095177d71948b2f74704d9a7b98515;hb=c2665e4b6e615c80e4126f1ff343e7f9f3018dcc;hp=dd76a048d8ad6213dddae92fedf3ac659c54fec4;hpb=e3042357921f7758a31a72b7e8bd4280ad1752b3;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index dd76a048d8..0a238a829f 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -868,6 +868,13 @@ $wgContentHandlers = array( CONTENT_MODEL_TEXT => 'TextContentHandler', ); +/** + * Whether to enable server-side image thumbnailing. If false, images will + * always be sent to the client in full resolution, with appropriate width= and + * height= attributes on the tag for the client to do its own scaling. + */ +$wgUseImageResize = true; + /** * Resizing can be done using PHP's internal image libraries or using * ImageMagick or another third-party converter, e.g. GraphicMagick. @@ -883,11 +890,6 @@ $wgUseImageMagick = false; */ $wgImageMagickConvertCommand = '/usr/bin/convert'; -/** - * The identify command shipped with ImageMagick - */ -$wgImageMagickIdentifyCommand = '/usr/bin/identify'; - /** * Sharpening parameter to ImageMagick */ @@ -1066,11 +1068,6 @@ $wgGenerateThumbnailOnParse = true; */ $wgShowArchiveThumbnails = true; -/** - * Obsolete, always true, kept for compatibility with extensions - */ -$wgUseImageResize = true; - /** * If set to true, images that contain certain the exif orientation tag will * be rotated accordingly. If set to null, try to auto-detect whether a scaler @@ -1385,6 +1382,18 @@ $wgNewPasswordExpiry = 3600 * 24 * 7; */ $wgUserEmailConfirmationTokenExpiry = 7 * 24 * 60 * 60; +/** + * The number of days that a user's password is good for. After this number of days, the + * user will be asked to reset their password. Set to false to disable password expiration. + */ +$wgPasswordExpirationDays = false; + +/** + * If a user's password is expired, the number of seconds when they can still login, + * and cancel their password change, but are sent to the password change form on each login. + */ +$wgPasswordExpireGrace = 3600 * 24 * 7; // 7 days + /** * SMTP Mode. * @@ -1585,7 +1594,7 @@ $wgSQLMode = ''; /** * Mediawiki schema */ -$wgDBmwschema = 'mediawiki'; +$wgDBmwschema = null; /** * To override default SQLite data directory ($docroot/../data) @@ -1805,6 +1814,11 @@ $wgSlaveLagWarning = 10; */ $wgSlaveLagCritical = 30; +/** + * Use Windows Authentication instead of $wgDBuser / $wgDBpassword for MS SQL Server + */ +$wgDBWindowsAuthentication = false; + /**@}*/ # End of DB settings } /************************************************************************//** @@ -2908,6 +2922,8 @@ $wgDefaultSkin = 'vector'; * Specify the name of a skin that should not be presented in the list of * available skins. Use for blacklisting a skin which you do not want to * remove from the .../skins/ directory + * + * @deprecated since 1.23; use $wgSkipSkins instead */ $wgSkipSkin = ''; @@ -3150,14 +3166,23 @@ $wgResourceBasePath = null; /** * Maximum time in seconds to cache resources served by the resource loader. + * Used to set last modified headers (max-age/s-maxage). * - * @todo Document array structure + * Following options to distinguish: + * - versioned: Used for modules with a version, because changing version + * numbers causes cache misses. This normally has a long expiry time. + * - unversioned: Used for modules without a version to propagate changes + * quickly to clients. Also used for modules with errors to recover quickly. + * This normally has a short expiry time. + * + * Expiry time for the options to distinguish: + * - server: Squid/Varnish but also any other public proxy cache between the + * client and MediaWiki. + * - client: On the client side (e.g. in the browser cache). */ $wgResourceLoaderMaxage = array( 'versioned' => array( - // Squid/Varnish but also any other public proxy cache between the client and MediaWiki 'server' => 30 * 24 * 60 * 60, // 30 days - // On the client side (e.g. in the browser cache). 'client' => 30 * 24 * 60 * 60, // 30 days ), 'unversioned' => array( @@ -4007,7 +4032,6 @@ $wgDefaultUserOptions = array( 'minordefault' => 0, 'newpageshidepatrolled' => 0, 'nickname' => '', - 'noconvertlink' => 0, 'norollbackdiff' => 0, 'numberheadings' => 0, 'previewonfirst' => 0, @@ -4025,7 +4049,6 @@ $wgDefaultUserOptions = array( 'underline' => 2, 'uselivepreview' => 0, 'usenewrc' => 0, - 'vector-simplesearch' => 1, 'watchcreations' => 1, 'watchdefault' => 1, 'watchdeletion' => 0, @@ -4715,6 +4738,8 @@ $wgRateLimits = array( /** * Set to a filename to log rate limiter hits. + * + * @deprecated since 1.23, use $wgDebugLogGroups['ratelimit'] instead */ $wgRateLimitLog = null; @@ -4927,10 +4952,12 @@ $wgDebugDumpSql = false; * of the regular $wgDebugLogFile. Useful for enabling selective logging * in production. * - * Log destinations may be string values specifying a filename or URI, or they - * may be filename or an associative array mapping 'destination' to the desired - * filename. The associative array may also contain a 'sample' key with an - * integer value, specifying a sampling factor. + * Log destinations may be one of the following: + * - false to completely remove from the output, including from $wgDebugLogFile. + * - string values specifying a filename or URI. + * - associative array mapping 'destination' key to the desired filename or URI. + * The associative array may also contain a 'sample' key with an integer value, + * specifying a sampling factor. * * @par Example: * @code @@ -4987,6 +5014,11 @@ $wgShowExceptionDetails = false; /** * If true, show a backtrace for database errors + * + * @note This setting only applies when connection errors and query errors are + * reported in the normal manner. $wgShowExceptionDetails applies in other cases, + * including those in which an uncaught exception is thrown from within the + * exception handler. */ $wgShowDBErrorBacktrace = false; @@ -5078,11 +5110,6 @@ $wgUDPProfilerPort = '3811'; */ $wgUDPProfilerFormatString = "%s - %d %f %f %f %f %s\n"; -/** - * Detects non-matching wfProfileIn/wfProfileOut calls - */ -$wgDebugProfiling = false; - /** * Output debug message on every wfProfileIn/wfProfileOut */ @@ -6479,12 +6506,6 @@ $wgActions = array( 'watch' => true, ); -/** - * Array of disabled article actions, e.g. view, edit, delete, etc. - * @deprecated since 1.18; just set $wgActions['action'] = false instead - */ -$wgDisabledActions = array(); - /** @} */ # end actions } /*************************************************************************//**