| Index: trunk/extensions/Configure/Configure.obj.php |
| — | — | @@ -88,7 +88,7 @@ |
| 89 | 89 | if( !is_array( $this->mDefaults ) ) { |
| 90 | 90 | $this->mDefaults = array(); |
| 91 | 91 | } |
| 92 | | - $settings = ConfigurationSettings::singleton( CONF_SETTINGS_BOTH )->getSnapshotSettings(); |
| | 92 | + $settings = ConfigurationSettings::singleton( CONF_SETTINGS_CORE )->getSnapshotSettings(); |
| 93 | 93 | foreach( $settings as $setting ) { |
| 94 | 94 | if( array_key_exists( $setting, $GLOBALS ) && |
| 95 | 95 | !( $noOverride && array_key_exists( $setting, $this->mDefaults ) ) ) |
| Index: trunk/extensions/Configure/Configure.page.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | protected function getSettingValue( $setting ) { |
| 127 | 127 | static $defaults; |
| 128 | 128 | |
| 129 | | - if (!$defaults) { |
| | 129 | + if ( !$defaults ) { |
| 130 | 130 | global $wgConf; |
| 131 | 131 | $defaults = $wgConf->getDefaultsForWiki( $this->mWiki ); |
| 132 | 132 | } |
| Index: trunk/extensions/Configure/Configure.settings.php |
| — | — | @@ -209,7 +209,8 @@ |
| 210 | 210 | global $wgConf, $wgConfigureNotEditableSettings, $wgConfigureEditableSettings; |
| 211 | 211 | $notEditable = array_merge( $notEditable, $wgConf->getUneditableSettings() ); |
| 212 | 212 | |
| 213 | | - if ( !count( $wgConfigureNotEditableSettings ) && count( $wgConfigureEditableSettings ) ) { |
| | 213 | + if ( !count( $wgConfigureNotEditableSettings ) && count( $wgConfigureEditableSettings ) && |
| | 214 | + ( $this->types & CONF_SETTINGS_CORE ) == CONF_SETTINGS_CORE ) { |
| 214 | 215 | // Only disallow core settings, not extensions settings! |
| 215 | 216 | $coreSettings = array(); |
| 216 | 217 | foreach( $this->settings as $section ) { |
| — | — | @@ -249,6 +250,12 @@ |
| 250 | 251 | foreach( $wgConfigureEditableSettings as $setting ) { |
| 251 | 252 | $this->cache['editable'][$setting] = $this->getSettingType( $setting ); |
| 252 | 253 | } |
| | 254 | + // We'll need to add extensions settings |
| | 255 | + if ( ( $this->types & CONF_SETTINGS_EXT ) == CONF_SETTINGS_EXT ) { |
| | 256 | + foreach ( $this->getAllExtensionsObjects() as $ext ) { |
| | 257 | + $this->cache['editable'] += $ext->getSettings(); |
| | 258 | + } |
| | 259 | + } |
| 253 | 260 | return $this->cache['editable']; |
| 254 | 261 | } |
| 255 | 262 | |