>
-
- $prefix.'[acf_fc_layout]', 'value' => $layout['name'] )); ?>
-
+ $prefix.'[acf_fc_layout]', 'value' => $layout['name'] )); ?>
@@ -749,20 +748,14 @@ class acf_field_flexible_content extends acf_field {
$rows = array();
- // populate $layouts
+ // sort layouts into names
$layouts = array();
+ foreach( $field['layouts'] as $k => $layout ) {
- foreach( array_keys($field['layouts']) as $i ) {
-
- // get layout
- $layout = $field['layouts'][ $i ];
-
-
- // append to $layouts
$layouts[ $layout['name'] ] = $layout['sub_fields'];
}
-
+
// loop through rows
foreach( $value as $i => $l ) {
@@ -846,16 +839,10 @@ class acf_field_flexible_content extends acf_field {
}
- // populate $layouts
+ // sort layouts into names
$layouts = array();
+ foreach( $field['layouts'] as $k => $layout ) {
- foreach( array_keys($field['layouts']) as $i ) {
-
- // get layout
- $layout = $field['layouts'][ $i ];
-
-
- // append to $layouts
$layouts[ $layout['name'] ] = $layout['sub_fields'];
}
@@ -1367,26 +1354,13 @@ class acf_field_flexible_content extends acf_field {
function update_field( $field ) {
- // vars
- $layouts = acf_extract_var($field, 'layouts');
-
-
- // update layouts
- $field['layouts'] = array();
-
-
- // loop through sub fields
- if( !empty($layouts) ) {
+ // loop
+ if( !empty($field['layouts']) ) {
- foreach( $layouts as $layout ) {
-
- // remove sub fields
+ foreach( $field['layouts'] as &$layout ) {
+
unset($layout['sub_fields']);
-
- // append to layouts
- $field['layouts'][] = $layout;
-
}
}
@@ -1518,61 +1492,22 @@ class acf_field_flexible_content extends acf_field {
'field_key' => '',
'nonce' => '',
'layout' => '',
- 'acf' => array()
+ 'value' => array()
));
// load field
$field = acf_get_field( $options['field_key'] );
-
if( !$field ) die();
// vars
- $layout = false;
-
- foreach( $field['layouts'] as $k => $layout ) {
-
- if( $layout['name'] === $options['layout'] ) break;
-
- }
-
-
- // bail ealry if no layout
+ $layout = $this->get_layout( $options['layout'], $field );
if( !$layout ) die();
- // value
- // this flexible content field may be a sub field so it is important to
- // loop though all $_POST data to find thi's field's row value
- $value = $options['acf'];
-
- while( is_array($value) ) {
-
- // move to end of array
- // - avoids 'acf_fc_layout' value
- end( $value );
-
-
- // vars (step through array)
- $key = key($value);
- $value = current($value);
-
-
- // stop looking if we have found the correct field's value
- if( $key === $options['field_key'] ) {
-
- // get row
- $value = current($value);
- break;
-
- }
-
- }
-
-
// title
- $title = $this->get_layout_title( $field, $layout, $options['i'], $value );
+ $title = $this->get_layout_title( $field, $layout, $options['i'], $options['value'] );
// echo
@@ -1675,15 +1610,15 @@ class acf_field_flexible_content extends acf_field {
function prepare_field_for_export( $field ) {
- // bail early if no layouts
- if( empty($field['layouts']) ) return $field;
-
-
// loop
- foreach( $field['layouts'] as $i => $layout ) {
+ if( !empty($field['layouts']) ) {
- $field['layouts'][ $i ]['sub_fields'] = acf_prepare_fields_for_export( $layout['sub_fields'] );
+ foreach( $field['layouts'] as &$layout ) {
+ $layout['sub_fields'] = acf_prepare_fields_for_export( $layout['sub_fields'] );
+
+ }
+
}
@@ -1815,6 +1750,43 @@ class acf_field_flexible_content extends acf_field {
}
+
+ /*
+ * translate_field
+ *
+ * This function will translate field settings
+ *
+ * @type function
+ * @date 8/03/2016
+ * @since 5.3.2
+ *
+ * @param $field (array)
+ * @return $field
+ */
+
+ function translate_field( $field ) {
+
+ // translate
+ $field['button_label'] = acf_translate( $field['button_label'] );
+
+
+ // loop
+ if( !empty($field['layouts']) ) {
+
+ foreach( $field['layouts'] as &$layout ) {
+
+ $layout['label'] = acf_translate($layout['label']);
+
+ }
+
+ }
+
+
+ // return
+ return $field;
+
+ }
+
}
diff --git a/readme.txt b/readme.txt
index bf280ac..6fbb621 100644
--- a/readme.txt
+++ b/readme.txt
@@ -106,6 +106,28 @@ http://support.advancedcustomfields.com/
== Changelog ==
+= 5.5.14 =
+* Core: Minor bug fixes
+
+= 5.5.13 =
+* Clone field: Improved 'Fields' setting to show all fields within a matching field group search
+* Flexible Content field: Fixed bug causing 'layout_title' filter to fail when field is cloned
+* Flexible Content field: Added missing 'translate_field' function
+* WYSIWYG field: Fixed JS error when using CKEditor plugin
+* Date Picker field: Improved 'Display Format' and 'Return Format' settings UI
+* Time Picker field: Same as above
+* Datetime Picker field: Same as above
+* Core: Added new 'remove_wp_meta_box' setting
+* Core: Added constants ACF, ACF_PRO, ACF_VERSION and ACF_PATH
+* Core: Improved compatibility with Select2 v4 including sortable functionality
+* Language: Updated Portuguese translation - thanks to Pedro Mendonça
+
+= 5.5.12 =
+* Tab field: Allowed HTML within field label to show in tab
+* Core: Improved plugin update class
+* Language: Updated Portuguese translation - thanks to Pedro Mendonça
+* Language: Updated Brazilian Portuguese translation - thanks to Rafael Ribeiro
+
= 5.5.11 =
* Google Map field: Added new 'google_map_init' JS action
* Core: Minor fixes and improvements