| Index: trunk/phase3/includes/SiteConfiguration.php |
| — | — | @@ -178,7 +178,16 @@ |
| 179 | 179 | function extractGlobal( $setting, $wiki, $suffix, $params, $wikiTags = array() ) { |
| 180 | 180 | $value = $this->get( $setting, $wiki, $suffix, $params, $wikiTags ); |
| 181 | 181 | if ( !is_null( $value ) ) { |
| 182 | | - $GLOBALS[$setting] = $value; |
| | 182 | + if (substr($setting,0,1) == '+' && is_array($value)) { |
| | 183 | + $setting = substr($setting,1); |
| | 184 | + if ( is_array($GLOBALS[$setting]) ) { |
| | 185 | + $GLOBALS[$setting] = array_merge( $GLOBALS[$setting], $value ); |
| | 186 | + } else { |
| | 187 | + $GLOBALS[$setting] = $value; |
| | 188 | + } |
| | 189 | + } else { |
| | 190 | + $GLOBALS[$setting] = $value; |
| | 191 | + } |
| 183 | 192 | } |
| 184 | 193 | } |
| 185 | 194 | |