| Index: trunk/extensions/Configure/SpecialConfigure.php |
| — | — | @@ -23,10 +23,11 @@ |
| 24 | 24 | $settings = $this->importFromRequest(); |
| 25 | 25 | |
| 26 | 26 | ## Add extensions settings, so we don't lose them.. |
| 27 | | - $extSettings = ConfigurationSettings::singleton( CONF_SETTINGS_EXTENSIONS )->getAllSettings(); |
| 28 | | - $current = $wgConf->getCurrent(); |
| | 27 | + $extSettings = ConfigurationSettings::singleton( CONF_SETTINGS_EXT )->getAllSettings(); |
| | 28 | + $current = $wgConf->getCurrent( $this->mWiki ); |
| 29 | 29 | foreach( $extSettings as $name => $type ) { |
| 30 | | - $settings[$name] = $current[$name]; |
| | 30 | + if( isset( $current[$name] ) ) |
| | 31 | + $settings[$name] = $current[$name]; |
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | $settings = $this->removeDefaults( $settings ); |