X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=d849910d7898b4cd91302ab4ceefd42dd55bed39;hb=21384993d98d1d96e3425d575cda407fb5bb1a8b;hp=58b3441fdf007b881c60bc7d6eb55900ba9c74ed;hpb=ea471f0d797c8213db981efe5ad0d393237d9d6f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 58b3441fdf..d849910d78 100644 --- 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. */ @@ -1163,41 +1172,42 @@ $wgEmailConfirmToEdit=false; $wgGroupPermissions = array(); // Implicit group for all visitors -$wgGroupPermissions['*' ]['createaccount'] = true; -$wgGroupPermissions['*' ]['read'] = true; -$wgGroupPermissions['*' ]['edit'] = true; -$wgGroupPermissions['*' ]['createpage'] = true; -$wgGroupPermissions['*' ]['createtalk'] = true; -$wgGroupPermissions['*' ]['writeapi'] = true; +$wgGroupPermissions['*']['createaccount'] = true; +$wgGroupPermissions['*']['read'] = true; +$wgGroupPermissions['*']['edit'] = true; +$wgGroupPermissions['*']['createpage'] = true; +$wgGroupPermissions['*']['createtalk'] = true; +$wgGroupPermissions['*']['writeapi'] = true; // Implicit group for all logged-in accounts -$wgGroupPermissions['user' ]['move'] = true; -$wgGroupPermissions['user' ]['move-subpages'] = true; -$wgGroupPermissions['user' ]['move-rootuserpages'] = true; // can move root userpages -$wgGroupPermissions['user' ]['read'] = true; -$wgGroupPermissions['user' ]['edit'] = true; -$wgGroupPermissions['user' ]['createpage'] = true; -$wgGroupPermissions['user' ]['createtalk'] = true; -$wgGroupPermissions['user' ]['writeapi'] = true; -$wgGroupPermissions['user' ]['upload'] = true; -$wgGroupPermissions['user' ]['reupload'] = true; -$wgGroupPermissions['user' ]['reupload-shared'] = true; -$wgGroupPermissions['user' ]['minoredit'] = true; -$wgGroupPermissions['user' ]['purge'] = true; // can use ?action=purge without clicking "ok" +$wgGroupPermissions['user']['move'] = true; +$wgGroupPermissions['user']['move-subpages'] = true; +$wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root userpages +//$wgGroupPermissions['user']['movefile'] = true; // Disabled for now due to possible bugs and security concerns +$wgGroupPermissions['user']['read'] = true; +$wgGroupPermissions['user']['edit'] = true; +$wgGroupPermissions['user']['createpage'] = true; +$wgGroupPermissions['user']['createtalk'] = true; +$wgGroupPermissions['user']['writeapi'] = true; +$wgGroupPermissions['user']['upload'] = true; +$wgGroupPermissions['user']['reupload'] = true; +$wgGroupPermissions['user']['reupload-shared'] = true; +$wgGroupPermissions['user']['minoredit'] = true; +$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without clicking "ok" // Implicit group for accounts that pass $wgAutoConfirmAge $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true; // Users with bot privilege can have their edits hidden // from various log pages by default -$wgGroupPermissions['bot' ]['bot'] = true; -$wgGroupPermissions['bot' ]['autoconfirmed'] = true; -$wgGroupPermissions['bot' ]['nominornewtalk'] = true; -$wgGroupPermissions['bot' ]['autopatrol'] = true; -$wgGroupPermissions['bot' ]['suppressredirect'] = true; -$wgGroupPermissions['bot' ]['apihighlimits'] = true; -$wgGroupPermissions['bot' ]['writeapi'] = true; -#$wgGroupPermissions['bot' ]['editprotected'] = true; // can edit all protected pages without cascade protection enabled +$wgGroupPermissions['bot']['bot'] = true; +$wgGroupPermissions['bot']['autoconfirmed'] = true; +$wgGroupPermissions['bot']['nominornewtalk'] = true; +$wgGroupPermissions['bot']['autopatrol'] = true; +$wgGroupPermissions['bot']['suppressredirect'] = true; +$wgGroupPermissions['bot']['apihighlimits'] = true; +$wgGroupPermissions['bot']['writeapi'] = true; +#$wgGroupPermissions['bot']['editprotected'] = true; // can edit all protected pages without cascade protection enabled // Most extra permission abilities go to this group $wgGroupPermissions['sysop']['block'] = true; @@ -1231,6 +1241,7 @@ $wgGroupPermissions['sysop']['markbotedits'] = true; $wgGroupPermissions['sysop']['apihighlimits'] = true; $wgGroupPermissions['sysop']['browsearchive'] = true; $wgGroupPermissions['sysop']['noratelimit'] = true; +$wgGroupPermissions['sysop']['movefile'] = true; #$wgGroupPermissions['sysop']['mergehistory'] = true; // Permission to change users' group assignments @@ -1444,7 +1455,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '188'; +$wgStyleVersion = '197'; # Server-side caching: @@ -1668,8 +1679,8 @@ $wgAllowExternalImagesFrom = ''; */ $wgEnableImageWhitelist = true; -/** Allows to move images and other media files. Experemintal, not sure if it always works */ -$wgAllowImageMoving = false; +/** Allows to move images and other media files */ +$wgAllowImageMoving = true; /** Disable database-intensive features */ $wgMiserMode = false; @@ -2023,7 +2034,7 @@ $wgCustomConvertCommand = false; # # An external program is required to perform this conversion: $wgSVGConverters = array( - 'ImageMagick' => '$path/convert -background white -geometry $width $input PNG:$output', + 'ImageMagick' => '$path/convert -background white -thumbnail $widthx$height\! $input PNG:$output', 'sodipodi' => '$path/sodipodi -z -w $width -f $input -e $output', 'inkscape' => '$path/inkscape -z -w $width -f $input -e $output', 'batik' => 'java -Djava.awt.headless=true -jar $path/batik-rasterizer.jar -w $width -d $output $input', @@ -2387,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, @@ -2395,7 +2410,9 @@ $wgDefaultUserOptions = array( 'fancysig' => 0, 'externaleditor' => 0, 'externaldiff' => 0, + 'forceeditsummary' => 0, 'showjumplinks' => 1, + 'justify' => 0, 'numberheadings' => 0, 'uselivepreview' => 0, 'watchlistdays' => 3.0, @@ -2403,6 +2420,8 @@ $wgDefaultUserOptions = array( 'watchlisthideminor' => 0, 'watchlisthidebots' => 0, 'watchlisthideown' => 0, + 'watchlisthideanons' => 0, + 'watchlisthideliu' => 0, 'watchcreations' => 0, 'watchdefault' => 0, 'watchmoves' => 0, @@ -2902,6 +2921,7 @@ $wgLogActions = array( 'suppress/event' => 'logdelete-logentry', 'suppress/delete' => 'suppressedarticle', 'suppress/block' => 'blocklogentry', + 'suppress/reblock' => 'reblock-logentry', ); /** @@ -2956,7 +2976,7 @@ $wgSpecialPageGroups = array( 'Log' => 'changes', 'Upload' => 'media', - 'Imagelist' => 'media', + 'Listfiles' => 'media', 'MIMEsearch' => 'media', 'FileDuplicateSearch' => 'media', 'Filepath' => 'media', @@ -3620,3 +3640,10 @@ $wgEdititis = false; * See http://universaleditbutton.org for more background information */ $wgUniversalEditButton = 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 + * and the functionality will be enabled universally. + */ +$wgEnforceHtmlIds = true;