pods-framework /
pods
| @@ 3412-3417 (lines=6) @@ | ||
| 3409 | if ( empty( $field[ 'name' ] ) ) |
|
| 3410 | $field[ 'name' ] = trim( $name ); |
|
| 3411 | ||
| 3412 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) { |
|
| 3413 | $field = array_merge( $object_fields[ $field[ 'name' ] ], $field ); |
|
| 3414 | } |
|
| 3415 | elseif ( isset( $this->fields[ $field[ 'name' ] ] ) ) { |
|
| 3416 | $field = array_merge( $this->fields[ $field[ 'name' ] ], $field ); |
|
| 3417 | } |
|
| 3418 | ||
| 3419 | if ( pods_var_raw( 'hidden', $field, false, null, true ) ) |
|
| 3420 | $field[ 'type' ] = 'hidden'; |
|
| @@ 3531-3534 (lines=4) @@ | ||
| 3528 | $field[ 'name' ] = trim( $name ); |
|
| 3529 | } |
|
| 3530 | ||
| 3531 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) |
|
| 3532 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 3533 | elseif ( isset( $this->fields[ $field[ 'name' ] ] ) ) |
|
| 3534 | $field = array_merge( $this->fields[ $field[ 'name' ] ], $field ); |
|
| 3535 | ||
| 3536 | if ( pods_v( 'hidden', $field, false, null, true ) || 'hidden' == $field[ 'type' ] ) { |
|
| 3537 | continue; |
|
| @@ 1617-1620 (lines=4) @@ | ||
| 1614 | if ( empty( $field[ 'name' ] ) ) |
|
| 1615 | $field[ 'name' ] = trim( $name ); |
|
| 1616 | ||
| 1617 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) |
|
| 1618 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 1619 | elseif ( isset( $this->pod->fields[ $field[ 'name' ] ] ) ) |
|
| 1620 | $field = array_merge( $this->pod->fields[ $field[ 'name' ] ], $field ); |
|
| 1621 | ||
| 1622 | if ( pods_var_raw( 'hidden', $field, false, null, true ) ) |
|
| 1623 | $field[ 'type' ] = 'hidden'; |
|
| @@ 1731-1736 (lines=6) @@ | ||
| 1728 | $field[ 'name' ] = trim( $name ); |
|
| 1729 | } |
|
| 1730 | ||
| 1731 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) { |
|
| 1732 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 1733 | } |
|
| 1734 | elseif ( isset( $this->pod->fields[ $field[ 'name' ] ] ) ) { |
|
| 1735 | $field = array_merge( $this->pod->fields[ $field[ 'name' ] ], $field ); |
|
| 1736 | } |
|
| 1737 | ||
| 1738 | if ( pods_v( 'hidden', $field, false, null, true ) || 'hidden' == $field[ 'type' ] ) { |
|
| 1739 | continue; |
|
