r45842 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45841‎ | r45842 | r45843 >
Date:16:43, 17 January 2009
Author:ialex
Status:deferred
Tags:
Comment:
Backport r45839
Modified paths:
  • /branches/REL1_14/extensions/Configure/CHANGELOG (modified) (history)
  • /branches/REL1_14/extensions/Configure/Configure.php (modified) (history)
  • /branches/REL1_14/extensions/Configure/Configure.settings.php (modified) (history)

Diff [purge]

Index: branches/REL1_14/extensions/Configure/CHANGELOG
@@ -1,6 +1,10 @@
22 This file lists changes on this extension.
33 Localisation updates are done on betawiki and aren't listed here.
44
 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+
59 1.14 branch-1 - 10 January 2009
610 * Fixed Special:Extensions: was sometimes throwing an error when saving the
711 configuration
Index: branches/REL1_14/extensions/Configure/Configure.settings.php
@@ -195,8 +195,17 @@
196196 $notEditable = array_merge( $notEditable, $wgConf->getUneditableSettings() );
197197
198198 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+ }
200207 }
 208+ $wgConfigureNotEditableSettings = array_diff( $coreSettings, $wgConfigureEditableSettings );
 209+ }
201210
202211 $notEditable = array_merge( $notEditable,
203212 $wgConfigureNotEditableSettings );
Index: branches/REL1_14/extensions/Configure/Configure.php
@@ -17,7 +17,7 @@
1818 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
1919 'description' => 'Allow authorised users to configure the wiki via a web-based interface',
2020 'descriptionmsg' => 'configure-desc',
21 - 'version' => '0.11.5 (1.14 branch-1)',
 21+ 'version' => '0.11.5 (1.14 branch-2)',
2222 );
2323
2424 # Configuration part

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45839Fixed "You are not allowed to read this setting" error for all settings on Sp...ialex16:19, 17 January 2009

Status & tagging log