pods-framework /
pods
| @@ 672-678 (lines=7) @@ | ||
| 669 | if ( ! empty( $pod->pod_data[ 'object_fields' ] ) ) { |
|
| 670 | $fields = array_merge( $fields, $pod->pod_data[ 'object_fields' ] ); |
|
| 671 | } |
|
| 672 | } elseif ( is_array( $pod ) && isset( $pod[ 'fields' ] ) ) { |
|
| 673 | $fields = $pod[ 'fields' ]; |
|
| 674 | ||
| 675 | if ( ! empty( $pod[ 'object_fields' ] ) ) { |
|
| 676 | $fields = array_merge( $fields, $pod[ 'object_fields' ] ); |
|
| 677 | } |
|
| 678 | } |
|
| 679 | ||
| 680 | return pods_serial_comma( $value, array( 'field' => $name, 'fields' => $fields ) ); |
|
| 681 | } |
|
| @@ 2988-2991 (lines=4) @@ | ||
| 2985 | 'flatten' => false |
|
| 2986 | ); |
|
| 2987 | ||
| 2988 | if ( is_array( $fields ) && ( isset( $fields[ 'fields' ] ) || isset( $fields[ 'depth' ] ) ) ) |
|
| 2989 | $params = array_merge( $params, $fields ); |
|
| 2990 | else |
|
| 2991 | $params[ 'fields' ] = $fields; |
|
| 2992 | ||
| 2993 | if ( isset( $params[ 'fields' ] ) && is_array( $params[ 'fields' ] ) && !in_array( $this->pod_data[ 'field_id' ], $params[ 'fields' ] ) ) |
|
| 2994 | $params[ 'fields' ] = array_merge( array( $this->pod_data[ 'field_id' ] ), $params[ 'fields' ] ); |
|
