Revision: 45968
Author: ialex
Date: 2009-01-21 19:50:36 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
* Fix for r45967, include extensions settings in
ConfigurationSettings::getEditableSettings() even when
$wgConfigureEditableSettings is non-empty
* Only snapshot core settings in WebConfiguration::snapshotDefaults()
* Whitespaces tweaks
Modified Paths:
--------------
trunk/extensions/Configure/Configure.obj.php
trunk/extensions/Configure/Configure.page.php
trunk/extensions/Configure/Configure.settings.php
Modified: trunk/extensions/Configure/Configure.obj.php
===================================================================
--- trunk/extensions/Configure/Configure.obj.php 2009-01-21 16:07:53 UTC
(rev 45967)
+++ trunk/extensions/Configure/Configure.obj.php 2009-01-21 19:50:36 UTC
(rev 45968)
@@ -88,7 +88,7 @@
if( !is_array( $this->mDefaults ) ) {
$this->mDefaults = array();
}
- $settings = ConfigurationSettings::singleton(
CONF_SETTINGS_BOTH )->getSnapshotSettings();
+ $settings = ConfigurationSettings::singleton(
CONF_SETTINGS_CORE )->getSnapshotSettings();
foreach( $settings as $setting ) {
if( array_key_exists( $setting, $GLOBALS ) &&
!( $noOverride && array_key_exists(
$setting, $this->mDefaults ) ) )
Modified: trunk/extensions/Configure/Configure.page.php
===================================================================
--- trunk/extensions/Configure/Configure.page.php 2009-01-21 16:07:53 UTC
(rev 45967)
+++ trunk/extensions/Configure/Configure.page.php 2009-01-21 19:50:36 UTC
(rev 45968)
@@ -125,7 +125,7 @@
protected function getSettingValue( $setting ) {
static $defaults;
- if (!$defaults) {
+ if ( !$defaults ) {
global $wgConf;
$defaults = $wgConf->getDefaultsForWiki( $this->mWiki );
}
Modified: trunk/extensions/Configure/Configure.settings.php
===================================================================
--- trunk/extensions/Configure/Configure.settings.php 2009-01-21 16:07:53 UTC
(rev 45967)
+++ trunk/extensions/Configure/Configure.settings.php 2009-01-21 19:50:36 UTC
(rev 45968)
@@ -209,7 +209,8 @@
global $wgConf, $wgConfigureNotEditableSettings,
$wgConfigureEditableSettings;
$notEditable = array_merge( $notEditable,
$wgConf->getUneditableSettings() );
- if ( !count( $wgConfigureNotEditableSettings ) && count(
$wgConfigureEditableSettings ) ) {
+ if ( !count( $wgConfigureNotEditableSettings ) && count(
$wgConfigureEditableSettings ) &&
+ ( $this->types & CONF_SETTINGS_CORE ) ==
CONF_SETTINGS_CORE ) {
// Only disallow core settings, not extensions settings!
$coreSettings = array();
foreach( $this->settings as $section ) {
@@ -249,6 +250,12 @@
foreach( $wgConfigureEditableSettings as $setting ) {
$this->cache['editable'][$setting] =
$this->getSettingType( $setting );
}
+ // We'll need to add extensions settings
+ if ( ( $this->types & CONF_SETTINGS_EXT ) ==
CONF_SETTINGS_EXT ) {
+ foreach ( $this->getAllExtensionsObjects() as
$ext ) {
+ $this->cache['editable'] +=
$ext->getSettings();
+ }
+ }
return $this->cache['editable'];
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
