r45634 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45633‎ | r45634 | r45635 >
Date:13:22, 10 January 2009
Author:ialex
Status:deferred
Tags:
Comment:
backport r45632
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,11 @@
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-1 - 10 January 2009
 6+ Fixed Special:Extensions: was sometimes throwing an error when saving the
 7+ configuration
 8+
 9+
510 0.11.5 - 31 December 2008
611 Fixed Special:Extensions: some settings using radio buttons had no radio
712 button pre-selected, resulting in an error when saving settings.
Index: branches/REL1_14/extensions/Configure/Configure.settings.php
@@ -95,10 +95,12 @@
9696 $ret = $this->settings;
9797 }
9898 if( ( $this->types & CONF_SETTINGS_EXT ) == CONF_SETTINGS_EXT ) {
99 - static $extArr;
100 - if( !isset($extArr) ) {
 99+ static $extArr = null;
 100+ if( is_null( $extArr ) ) {
101101 $extArr = array();
102102 foreach( $this->getAllExtensionsObjects() as $ext ) {
 103+ if( !$ext->isInstalled() )
 104+ continue;
103105 $extSettings = $ext->getSettings();
104106 if( $ext->useVariable() )
105107 $extSettings[$ext->getVariable()] = 'bool';
@@ -244,7 +246,7 @@
245247 }
246248 if ( ( $this->types & CONF_SETTINGS_EXT ) == CONF_SETTINGS_EXT ) {
247249 foreach ( $this->getAllExtensionsObjects() as $ext ) {
248 - $list += $ext->getArrayDefs();
 250+ $list += $ext->getArrayDefs();
249251 }
250252 }
251253 return $this->cache['array'] = $list;
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',
 21+ 'version' => '0.11.5 (1.14 branch-1)',
2222 );
2323
2424 # Configuration part

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45632Fixed Special:Extensions: was sometimes throwing an error when saving the con...ialex11:27, 10 January 2009

Status & tagging log