| Index: trunk/extensions/Configure/SpecialConfigure.php |
| — | — | @@ -19,12 +19,16 @@ |
| 20 | 20 | protected function doSubmit() { |
| 21 | 21 | global $wgConf, $wgOut, $wgConfigureUpdateCacheEpoch, $wgUser, $wgRequest; |
| 22 | 22 | |
| 23 | | - // These two lines left in and commented-out until I figure out what they're for. |
| 24 | | - // They seem to break stuff :) |
| 25 | 23 | $reason = $wgRequest->getText( 'wpReason' ); |
| 26 | | -// $current = $wgConf->getCurrent( $this->mWiki ); |
| 27 | 24 | $settings = $this->importFromRequest(); |
| 28 | | -// $settings += $current; |
| | 25 | + |
| | 26 | + ## Add extensions settings, so we don't lose them.. |
| | 27 | + $extSettings = ConfigurationSettings::singleton( CONF_SETTINGS_EXTENSIONS )->getAllSettings(); |
| | 28 | + $current = $wgConf->getCurrent(); |
| | 29 | + foreach( $extSettings as $name => $type ) { |
| | 30 | + $settings[$name] = $current[$name]; |
| | 31 | + } |
| | 32 | + |
| 29 | 33 | $settings = $this->removeDefaults( $settings ); |
| 30 | 34 | if ( $wgConfigureUpdateCacheEpoch ) |
| 31 | 35 | $settings['wgCacheEpoch'] = max( $settings['wgCacheEpoch'], wfTimestampNow() ); |