@@ -49,13 +49,13 @@ discard block |
||
49 | 49 | if($value === null) { |
50 | 50 | if(isset(self::$config[$part])) { |
51 | 51 | $value = self::$config[$part]; |
52 | - }else{ |
|
52 | + } else{ |
|
53 | 53 | break; |
54 | 54 | } |
55 | - }else{ |
|
55 | + } else{ |
|
56 | 56 | if(isset($value[$part])) { |
57 | 57 | $value = $value[$part]; |
58 | - }else{ |
|
58 | + } else{ |
|
59 | 59 | break; |
60 | 60 | } |
61 | 61 | } |
@@ -106,11 +106,15 @@ discard block |
||
106 | 106 | $arrays = func_get_args(); |
107 | 107 | $base = array_shift($arrays); |
108 | 108 | |
109 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
109 | + if(!is_array($base)) { |
|
110 | + $base = empty($base) ? array() : array($base); |
|
111 | + } |
|
110 | 112 | |
111 | 113 | foreach($arrays as $append) { |
112 | 114 | |
113 | - if(!is_array($append)) $append = array($append); |
|
115 | + if(!is_array($append)) { |
|
116 | + $append = array($append); |
|
117 | + } |
|
114 | 118 | |
115 | 119 | foreach($append as $key => $value) { |
116 | 120 | |
@@ -122,7 +126,9 @@ discard block |
||
122 | 126 | if(is_array($value) or is_array($base[$key])) { |
123 | 127 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
124 | 128 | } else if(is_numeric($key)) { |
125 | - if(!in_array($value, $base)) $base[] = $value; |
|
129 | + if(!in_array($value, $base)) { |
|
130 | + $base[] = $value; |
|
131 | + } |
|
126 | 132 | } else { |
127 | 133 | $base[$key] = $value; |
128 | 134 | } |