| Index: trunk/phase3/includes/SiteConfiguration.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | foreach ( $wikiTags as $tag ) { |
| 49 | 49 | if ( array_key_exists( $tag, $thisSetting ) ) { |
| 50 | 50 | if ( isset($retval) && is_array($retval) && is_array($thisSetting[$tag]) ) { |
| 51 | | - $retval = array_merge( $retval, $thisSetting[$tag] ); |
| | 51 | + $retval = array_merge_recursive( $retval, $thisSetting[$tag] ); |
| 52 | 52 | } else { |
| 53 | 53 | $retval = $thisSetting[$tag]; |
| 54 | 54 | } |
| — | — | @@ -55,14 +55,14 @@ |
| 56 | 56 | } elseif ( array_key_exists( "+$tag", $thisSetting ) && is_array($thisSetting["+$tag"]) ) { |
| 57 | 57 | if (!isset($retval)) |
| 58 | 58 | $retval = array(); |
| 59 | | - $retval = array_merge( $retval, $thisSetting["+$tag"] ); |
| | 59 | + $retval = array_merge_recursive( $retval, $thisSetting["+$tag"] ); |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // Do suffix settings |
| 64 | 64 | if ( array_key_exists( $suffix, $thisSetting ) ) { |
| 65 | 65 | if ( isset($retval) && is_array($retval) && is_array($thisSetting[$suffix]) ) { |
| 66 | | - $retval = array_merge( $retval, $thisSetting[$suffix] ); |
| | 66 | + $retval = array_merge_recursive( $retval, $thisSetting[$suffix] ); |
| 67 | 67 | } else { |
| 68 | 68 | $retval = $thisSetting[$suffix]; |
| 69 | 69 | } |
| — | — | @@ -70,13 +70,13 @@ |
| 71 | 71 | } elseif ( array_key_exists( "+$suffix", $thisSetting ) && is_array($thisSetting["+$suffix"]) ) { |
| 72 | 72 | if (!isset($retval)) |
| 73 | 73 | $retval = array(); |
| 74 | | - $retval = array_merge( $retval, $thisSetting["+$suffix"] ); |
| | 74 | + $retval = array_merge_recursive( $retval, $thisSetting["+$suffix"] ); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // Fall back to default. |
| 78 | 78 | if ( array_key_exists( 'default', $thisSetting ) ) { |
| 79 | 79 | if ( isset($retval) && is_array($retval) && is_array($thisSetting['default']) ) { |
| 80 | | - $retval = array_merge( $retval, $thisSetting['default'] ); |
| | 80 | + $retval = array_merge_recursive( $retval, $thisSetting['default'] ); |
| 81 | 81 | } else { |
| 82 | 82 | $retval = $thisSetting['default']; |
| 83 | 83 | } |
| — | — | @@ -181,7 +181,7 @@ |
| 182 | 182 | if (substr($setting,0,1) == '+' && is_array($value)) { |
| 183 | 183 | $setting = substr($setting,1); |
| 184 | 184 | if ( is_array($GLOBALS[$setting]) ) { |
| 185 | | - $GLOBALS[$setting] = array_merge( $GLOBALS[$setting], $value ); |
| | 185 | + $GLOBALS[$setting] = array_merge_recursive( $GLOBALS[$setting], $value ); |
| 186 | 186 | } else { |
| 187 | 187 | $GLOBALS[$setting] = $value; |
| 188 | 188 | } |