| Index: trunk/extensions/Configure/Configure.obj.php |
| — | — | @@ -170,13 +170,27 @@ |
| 171 | 171 | // Hmm, a better solution would be nice! |
| 172 | 172 | $savedSettings = $this->settings; |
| 173 | 173 | $this->settings = $this->mOldSettings; |
| | 174 | + $globalDefaults = $this->getDefaults(); |
| | 175 | + |
| | 176 | + $savedGlobals = array(); |
| | 177 | + foreach( $this->settings as $name => $val ){ |
| | 178 | + if( substr( $name, 0, 1 ) == '+' ){ |
| | 179 | + $setting = substr( $name, 1 ); |
| | 180 | + if( isset( $globalDefaults[$setting] ) ){ |
| | 181 | + $savedGlobals[$setting] = $GLOBALS[$setting]; |
| | 182 | + $GLOBALS[$setting] = $globalDefaults[$setting]; |
| | 183 | + } |
| | 184 | + } |
| | 185 | + } |
| 174 | 186 | |
| 175 | 187 | $wikiDefaults = $this->getCurrent( $wiki ); |
| 176 | 188 | |
| 177 | 189 | $this->settings = $savedSettings; |
| 178 | 190 | unset( $savedSettings ); |
| | 191 | + foreach( $savedGlobals as $name => $val ){ |
| | 192 | + $GLOBALS[$setting] = $savedGlobals[$setting]; |
| | 193 | + } |
| 179 | 194 | |
| 180 | | - $globalDefaults = $this->getDefaults(); |
| 181 | 195 | $ret = array(); |
| 182 | 196 | $keys = array_unique( array_merge( array_keys( $wikiDefaults ), array_keys( $globalDefaults ) ) ); |
| 183 | 197 | foreach( $keys as $setting ){ |
| Index: trunk/extensions/Configure/CHANGELOG |
| — | — | @@ -1,6 +1,9 @@ |
| 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.9.2 - 6 November 2008 |
| | 6 | + Fixed a bug in settings merging (introduced in version 0.8.10). |
| | 7 | + |
| 5 | 8 | 0.9.1 - 5 November 2008 |
| 6 | 9 | * MediaWiki: added $wgAllowUserSkin, $wgDebugLogPrefix, $wgEnotifUseRealName |
| 7 | 10 | and $wgImageMagickTempDir. |
| 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 by a web-based interface', |
| 20 | 20 | 'descriptionmsg' => 'configure-desc', |
| 21 | | - 'version' => '0.9.1', |
| | 21 | + 'version' => '0.9.2', |
| 22 | 22 | ); |
| 23 | 23 | |
| 24 | 24 | ## Configuration part |