Index: branches/REL1_14/extensions/Configure/CHANGELOG |
— | — | @@ -1,6 +1,10 @@ |
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 | +1.14 branch-2 - 17 January 2009 |
| 6 | + Fixed "You are not allowed to read this setting" error for all settings on |
| 7 | + Special:Extensions when $wgConfigureEditableSettings is an non-empty array. |
| 8 | + |
5 | 9 | 1.14 branch-1 - 10 January 2009 |
6 | 10 | * Fixed Special:Extensions: was sometimes throwing an error when saving the |
7 | 11 | configuration |
Index: branches/REL1_14/extensions/Configure/Configure.settings.php |
— | — | @@ -195,8 +195,17 @@ |
196 | 196 | $notEditable = array_merge( $notEditable, $wgConf->getUneditableSettings() ); |
197 | 197 | |
198 | 198 | if ( !count( $wgConfigureNotEditableSettings ) && count( $wgConfigureEditableSettings ) ) { |
199 | | - $wgConfigureNotEditableSettings = array_diff( array_keys( $this->getAllSettings() ), $wgConfigureEditableSettings ); |
| 199 | + // Only disallow core settings, not extensions settings! |
| 200 | + $coreSettings = array(); |
| 201 | + foreach( $this->settings as $section ) { |
| 202 | + foreach( $section as $group ) { |
| 203 | + foreach( $group as $var => $type ) { |
| 204 | + $coreSettings[] = $var; |
| 205 | + } |
| 206 | + } |
200 | 207 | } |
| 208 | + $wgConfigureNotEditableSettings = array_diff( $coreSettings, $wgConfigureEditableSettings ); |
| 209 | + } |
201 | 210 | |
202 | 211 | $notEditable = array_merge( $notEditable, |
203 | 212 | $wgConfigureNotEditableSettings ); |
Index: branches/REL1_14/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 via a web-based interface', |
20 | 20 | 'descriptionmsg' => 'configure-desc', |
21 | | - 'version' => '0.11.5 (1.14 branch-1)', |
| 21 | + 'version' => '0.11.5 (1.14 branch-2)', |
22 | 22 | ); |
23 | 23 | |
24 | 24 | # Configuration part |