r45632 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45631‎ | r45632 | r45633 >
Date:11:27, 10 January 2009
Author:ialex
Status:ok
Tags:
Comment:
Fixed Special:Extensions: was sometimes throwing an error when saving the configuration
Modified paths:
  • /trunk/extensions/Configure/CHANGELOG (modified) (history)
  • /trunk/extensions/Configure/Configure.settings.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/CHANGELOG
@@ -3,6 +3,8 @@
44
55 0.11.7 - 10 January 2009
66 * Added support for Redirect
 7+ * Fixed Special:Extensions: was sometimes throwing an error when saving the
 8+ configuration
79
810 0.11.6 - 7 January 2009
911 * Added support for OpenID, NewUserMessage and ReplaceText extensions.
Index: trunk/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;

Follow-up revisions

RevisionCommit summaryAuthorDate
r45634backport r45632ialex13:22, 10 January 2009

Status & tagging log