| Index: trunk/extensions/Configure/Configure.obj.php |
| — | — | @@ -38,8 +38,14 @@ |
| 39 | 39 | public function initialise( $useCache = true ) { |
| 40 | 40 | parent::initialise(); |
| 41 | 41 | $this->mConf = $this->mHandler->getCurrent( $useCache ); |
| 42 | | - $this->mOldSettings = $this->settings; |
| 43 | 42 | |
| | 43 | + # Restore first version of $this->settings if called a second time so |
| | 44 | + # that it doesn't duplicate arrays |
| | 45 | + if( !count( $this->mOldSettings ) ) |
| | 46 | + $this->mOldSettings = $this->settings; |
| | 47 | + else |
| | 48 | + $this->settings = $this->mOldSettings; |
| | 49 | + |
| 44 | 50 | # We'll need to invert the order of keys as SiteConfiguration uses |
| 45 | 51 | # $settings[$setting][$wiki] and the extension uses $settings[$wiki][$setting] |
| 46 | 52 | foreach ( $this->mConf as $site => $settings ) { |