@@ 881-884 (lines=4) @@ | ||
878 | ||
879 | foreach ( $data as $key => $item ) { |
|
880 | foreach ( $codeSequence as $csCode ) { |
|
881 | if ( isset( $item[$csCode] ) ) { |
|
882 | $this->mergeItem( $key, $extensionData[$csCode][$key], $item[$csCode] ); |
|
883 | $used = true; |
|
884 | } |
|
885 | } |
|
886 | } |
|
887 | ||
@@ 913-917 (lines=5) @@ | ||
910 | } |
|
911 | ||
912 | # Merge non-JSON extension data |
|
913 | if ( isset( $extensionData[$csCode] ) ) { |
|
914 | foreach ( $extensionData[$csCode] as $key => $item ) { |
|
915 | $this->mergeItem( $key, $csData[$key], $item ); |
|
916 | } |
|
917 | } |
|
918 | ||
919 | if ( $csCode === $code ) { |
|
920 | # Merge core data into extension data |