pods-framework /
pods
| @@ 813-819 (lines=7) @@ | ||
| 810 | if ( ! empty( $pod->pod_data[ 'object_fields' ] ) ) { |
|
| 811 | $fields = array_merge( $fields, $pod->pod_data[ 'object_fields' ] ); |
|
| 812 | } |
|
| 813 | } elseif ( is_array( $pod ) && isset( $pod[ 'fields' ] ) ) { |
|
| 814 | $fields = $pod[ 'fields' ]; |
|
| 815 | ||
| 816 | if ( ! empty( $pod[ 'object_fields' ] ) ) { |
|
| 817 | $fields = array_merge( $fields, $pod[ 'object_fields' ] ); |
|
| 818 | } |
|
| 819 | } |
|
| 820 | ||
| 821 | return pods_serial_comma( $value, array( 'field' => $name, 'fields' => $fields ) ); |
|
| 822 | } |
|
| @@ 3011-3014 (lines=4) @@ | ||
| 3008 | 'flatten' => false |
|
| 3009 | ); |
|
| 3010 | ||
| 3011 | if ( is_array( $fields ) && ( isset( $fields[ 'fields' ] ) || isset( $fields[ 'depth' ] ) ) ) |
|
| 3012 | $params = array_merge( $params, $fields ); |
|
| 3013 | else |
|
| 3014 | $params[ 'fields' ] = $fields; |
|
| 3015 | ||
| 3016 | if ( isset( $params[ 'fields' ] ) && is_array( $params[ 'fields' ] ) && !in_array( $this->pod_data[ 'field_id' ], $params[ 'fields' ] ) ) |
|
| 3017 | $params[ 'fields' ] = array_merge( array( $this->pod_data[ 'field_id' ] ), $params[ 'fields' ] ); |
|
