| Index: trunk/extensions/Configure/CHANGELOG |
| — | — | @@ -1,6 +1,10 @@ |
| 2 | 2 | This file lists changes on this extension. |
| 3 | 3 | Localisation updates are done on betawiki and aren't listed here. |
| 4 | 4 | |
| | 5 | +0.13.9 - 4 April 2009 |
| | 6 | + Settings that weren't taken into account when using database handler with |
| | 7 | + $wgConfigureAllowDeferSetup = true are now ignored with that configuration. |
| | 8 | + |
| 5 | 9 | 0.13.8 - 1 April 2009 |
| 6 | 10 | Added $wgUseImageResize, $wgCopyUploadTimeout, $wgInvalidUsernameCharacters |
| 7 | 11 | and $wgUserrightsInterwikiDelimiter. |
| Index: trunk/extensions/Configure/Configure.handler-db.php |
| — | — | @@ -323,7 +323,9 @@ |
| 324 | 324 | * Get settings that are not editable with the database handler |
| 325 | 325 | */ |
| 326 | 326 | public function getUneditableSettings() { |
| 327 | | - return array( |
| | 327 | + global $wgConfigureAllowDeferSetup; |
| | 328 | + |
| | 329 | + $uneditable = array( |
| 328 | 330 | # Database |
| 329 | 331 | 'wgAllDBsAreLocalhost', |
| 330 | 332 | 'wgCheckDBSchema', |
| — | — | @@ -356,5 +358,38 @@ |
| 357 | 359 | 'wgMemCachedPersistent', |
| 358 | 360 | 'wgMemCachedServers', |
| 359 | 361 | ); |
| | 362 | + |
| | 363 | + if ( $wgConfigureAllowDeferSetup ) { |
| | 364 | + // These settings are backward compatible settings which are used |
| | 365 | + // in Setup.php before the SetupAfterCache hook is called |
| | 366 | + $uneditable = array_merge( $uneditable, array( |
| | 367 | + # Uploads |
| | 368 | + 'wgUseSharedUploads', |
| | 369 | + 'wgUploadDirectory', |
| | 370 | + 'wgUploadBaseUrl', |
| | 371 | + 'wgUploadPath', |
| | 372 | + 'wgHashedUploadDirectory', |
| | 373 | + 'wgThumbnailScriptPath', |
| | 374 | + 'wgGenerateThumbnailOnParse', |
| | 375 | + 'wgSharedUploadDirectory', |
| | 376 | + 'wgSharedUploadPath', |
| | 377 | + 'wgHashedSharedUploadDirectory', |
| | 378 | + 'wgSharedThumbnailScriptPath', |
| | 379 | + 'wgSharedUploadDBname', |
| | 380 | + 'wgSharedUploadDBprefix', |
| | 381 | + 'wgCacheSharedUploads', |
| | 382 | + 'wgRepositoryBaseUrl', |
| | 383 | + 'wgFetchCommonsDescriptions', |
| | 384 | + # Recent changes |
| | 385 | + 'wgRCFilterByAge', |
| | 386 | + # Skins |
| | 387 | + 'wgSkipSkin', |
| | 388 | + # Cache |
| | 389 | + 'wgParserCacheType', |
| | 390 | + 'wgMessageCacheType', |
| | 391 | + ) ); |
| | 392 | + } |
| | 393 | + |
| | 394 | + return $uneditable; |
| 360 | 395 | } |
| 361 | 396 | } |
| Index: trunk/extensions/Configure/Configure.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure', |
| 19 | 19 | 'description' => 'Allow authorised users to configure the wiki via a web-based interface', |
| 20 | 20 | 'descriptionmsg' => 'configure-desc', |
| 21 | | - 'version' => '0.13.8', |
| | 21 | + 'version' => '0.13.9', |
| 22 | 22 | ); |
| 23 | 23 | |
| 24 | 24 | # Configuration part |