pods-framework /
pods
| @@ 3427-3432 (lines=6) @@ | ||
| 3424 | if ( empty( $field[ 'name' ] ) ) |
|
| 3425 | $field[ 'name' ] = trim( $name ); |
|
| 3426 | ||
| 3427 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) { |
|
| 3428 | $field = array_merge( $object_fields[ $field[ 'name' ] ], $field ); |
|
| 3429 | } |
|
| 3430 | elseif ( isset( $this->fields[ $field[ 'name' ] ] ) ) { |
|
| 3431 | $field = array_merge( $this->fields[ $field[ 'name' ] ], $field ); |
|
| 3432 | } |
|
| 3433 | ||
| 3434 | if ( pods_var_raw( 'hidden', $field, false, null, true ) ) |
|
| 3435 | $field[ 'type' ] = 'hidden'; |
|
| @@ 3546-3549 (lines=4) @@ | ||
| 3543 | $field[ 'name' ] = trim( $name ); |
|
| 3544 | } |
|
| 3545 | ||
| 3546 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) |
|
| 3547 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 3548 | elseif ( isset( $this->fields[ $field[ 'name' ] ] ) ) |
|
| 3549 | $field = array_merge( $this->fields[ $field[ 'name' ] ], $field ); |
|
| 3550 | ||
| 3551 | if ( pods_v( 'hidden', $field, false, null, true ) || 'hidden' == $field[ 'type' ] ) { |
|
| 3552 | continue; |
|
| @@ 1623-1626 (lines=4) @@ | ||
| 1620 | if ( empty( $field[ 'name' ] ) ) |
|
| 1621 | $field[ 'name' ] = trim( $name ); |
|
| 1622 | ||
| 1623 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) |
|
| 1624 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 1625 | elseif ( isset( $this->pod->fields[ $field[ 'name' ] ] ) ) |
|
| 1626 | $field = array_merge( $this->pod->fields[ $field[ 'name' ] ], $field ); |
|
| 1627 | ||
| 1628 | if ( pods_var_raw( 'hidden', $field, false, null, true ) ) |
|
| 1629 | $field[ 'type' ] = 'hidden'; |
|
| @@ 1737-1742 (lines=6) @@ | ||
| 1734 | $field[ 'name' ] = trim( $name ); |
|
| 1735 | } |
|
| 1736 | ||
| 1737 | if ( isset( $object_fields[ $field[ 'name' ] ] ) ) { |
|
| 1738 | $field = array_merge( $field, $object_fields[ $field[ 'name' ] ] ); |
|
| 1739 | } |
|
| 1740 | elseif ( isset( $this->pod->fields[ $field[ 'name' ] ] ) ) { |
|
| 1741 | $field = array_merge( $this->pod->fields[ $field[ 'name' ] ], $field ); |
|
| 1742 | } |
|
| 1743 | ||
| 1744 | if ( pods_v( 'hidden', $field, false, null, true ) || 'hidden' == $field[ 'type' ] ) { |
|
| 1745 | continue; |
|
