Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions includes/acf-field-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -349,18 +349,20 @@ function acf_get_fields( $parent ) {
// Vars.
$fields = array();

// Check local fields first.
if( acf_have_local_fields($parent['key']) ) {
$raw_fields = acf_get_local_fields( $parent['key'] );
foreach( $raw_fields as $raw_field ) {
$fields[] = acf_get_field( $raw_field['key'] );
}

// Then check database.
} else {
$raw_fields = acf_get_raw_fields( $parent['ID'] );
foreach( $raw_fields as $raw_field ) {
$fields[] = acf_get_field( $raw_field['ID'] );
if ( isset($parent['key'], $parent['ID']) ) {
// Check local fields first.
if( acf_have_local_fields($parent['key']) ) {
$raw_fields = acf_get_local_fields( $parent['key'] );
foreach( $raw_fields as $raw_field ) {
$fields[] = acf_get_field( $raw_field['key'] );
}

// Then check database.
} else {
$raw_fields = acf_get_raw_fields( $parent['ID'] );
foreach( $raw_fields as $raw_field ) {
$fields[] = acf_get_field( $raw_field['ID'] );
}
}
}

Expand Down