Merge branch 'release/5.6.1' into develop

acf.php

@@ -3,7 +3,7 @@
 Plugin Name: Advanced Custom Fields PRO
 Plugin URI: https://www.advancedcustomfields.com/
 Description: Customise WordPress with powerful, professional and intuitive fields.
-Version: 5.6.0
+Version: 5.6.1
 Author: Elliot Condon
 Author URI: http://www.elliotcondon.com/
 Copyright: Elliot Condon
@@ -18,7 +18,7 @@ if( ! class_exists('acf') ) :
 class acf {
 	
 	// vars
-	var $version = '5.6.0';
+	var $version = '5.6.1';
 	
 	
 	/*
@@ -323,6 +323,10 @@ class acf {
 		load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile );
 		
 		
+		// redirect missing translations
+		$mofile = str_replace('fr_CA', 'fr_FR', $mofile);
+		
+		
 		// load from plugin lang folder
 		load_textdomain( $domain, acf_get_path( 'lang/' . $mofile ) );
 		

assets/js/acf-input.js

@@ -1746,7 +1746,7 @@ var acf;
 			$.each(args, function(k,v){
 				
 				// object
-				if( typeof v === 'object' ) {
+				if( $.isPlainObject(v) && !$.isEmptyObject(v) ) {
 					
 					// loop
 					$.each(v, function(k2,v2){
@@ -3636,7 +3636,7 @@ var acf;
 		confirm: function( $el, callback, text, button_y, button_n ){
 			
 			// defaults
-			text = text || 'Are you sure?';
+			text = text || acf._e('are_you_sure');
 			button_y = button_y || '<a href="#" class="acf-confirm-y">'+acf._e('yes')+'</a>';
 			button_n = button_n || '<a href="#" class="acf-confirm-n">'+acf._e('No')+'</a>';
 			

includes/fields/class-acf-field-group.php

@@ -30,6 +30,11 @@ class acf_field__group extends acf_field {
 		);
 		$this->have_rows = 'single';
 		
+		
+		// field filters
+		$this->add_field_filter('acf/prepare_field_for_export', array($this, 'prepare_field_for_export'));
+		$this->add_field_filter('acf/prepare_field_for_import', array($this, 'prepare_field_for_import'));
+		
 	}
 		
 	
@@ -534,6 +539,80 @@ class acf_field__group extends acf_field {
 		return $valid;
 		
 	}
+	
+	
+	/*
+	*  prepare_field_for_export
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	11/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function prepare_field_for_export( $field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $field;
+		
+		
+		// prepare
+		$field['sub_fields'] = acf_prepare_fields_for_export( $field['sub_fields'] );
+		
+		
+		// return
+		return $field;
+		
+	}
+	
+	
+	/*
+	*  prepare_field_for_import
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	11/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function prepare_field_for_import( $field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $field;
+		
+		
+		// vars
+		$sub_fields = $field['sub_fields'];
+		
+		
+		// reset field setting
+		$field['sub_fields'] = array();
+		
+		
+		// loop
+		foreach( $sub_fields as &$sub_field ) {
+			
+			$sub_field['parent'] = $field['key'];
+			
+		}
+		
+		
+		// merge
+		array_unshift($sub_fields, $field);
+		
+		
+		// return
+		return $sub_fields;
+		
+	}
 		
 }
 

includes/forms/form-nav-menu.php

@@ -85,7 +85,7 @@ class acf_form_nav_menu {
 		// verify and remove nonce
 		if( !acf_verify_nonce('nav_menu') ) return $menu_id;
 		
-	    
+			   
 	    // validate and show errors
 		acf_validate_save_post( true );
 		
@@ -269,6 +269,44 @@ class acf_form_nav_menu {
 	
 	// append html
 	$('#post-body-content').append( $('#tmpl-acf-menu-settings').html() );
+	
+	
+	// avoid WP over-writing $_POST data
+	// - https://core.trac.wordpress.org/ticket/41502#ticket
+	$(document).on('submit', '#update-nav-menu', function() {
+
+		// vars
+		var $form = $(this);
+		var $input = $('input[name="nav-menu-data"]');
+		
+		
+		// decode json
+		var json = $form.serializeArray();
+		var json2 = [];
+		
+		
+		// loop
+		$.each( json, function( i, pair ) {
+			
+			// avoid nesting (unlike WP)
+			if( pair.name === 'nav-menu-data' ) return;
+			
+			
+			// bail early if is 'acf[' input
+			if( pair.name.indexOf('acf[') > -1 ) return;
+						
+			
+			// append
+			json2.push( pair );
+			
+		});
+		
+		
+		// update
+		$input.val( JSON.stringify(json2) );
+		
+	});
+		
 		
 })(jQuery);	
 </script>

includes/forms/form-taxonomy.php

@@ -358,6 +358,10 @@ class acf_form_taxonomy {
 		$('#acf-form-data').after( $orig.clone() );
 		
 		
+		// reset unload
+		acf.unload.off();
+		
+		
 		// action for 3rd party customization
 		acf.do_action('append', $('#addtag'));
 		

includes/forms/form-widget.php

@@ -101,7 +101,7 @@ class acf_form_widget {
 	
 	function acf_validate_save_post() {
 		
-		// bai lealry if not widget
+		// bail ealry if not widget
 		if( !isset($_POST['_acf_widget_id']) ) return;
 		
 		

includes/input.php

@@ -31,7 +31,7 @@ class acf_input {
 		
 		
 		// actions
-		add_action('acf/save_post', array($this, 'save_post'), 10, 2);
+		add_action('acf/save_post', array($this, 'save_post'), 10, 1);
 		
 	}
 	
@@ -263,6 +263,7 @@ class acf_input {
 			'validation_failed_1'	=> __('1 field requires attention', 'acf'),
 			'validation_failed_2'	=> __('%d fields require attention', 'acf'),
 			'restricted'			=> __('Restricted','acf'),
+			'are_you_sure'			=> __('Are you sure?','acf'),
 			'yes'					=> __('Yes','acf'),
 			'no'					=> __('No','acf'),
 			'remove'				=> __('Remove','acf'),
@@ -307,10 +308,15 @@ do_action('acf/input/admin_footer');
 	*  @return	n/a
 	*/
 	
-	function save_post( $post_id, $values ) {
+	function save_post( $post_id ) {
+		
+		// bail early if empty
+		// - post data may have be modified
+		if( empty($_POST['acf']) ) return;
+		
 		
 		// loop
-		foreach( $values as $k => $v ) {
+		foreach( $_POST['acf'] as $k => $v ) {
 			
 			// get field
 			$field = acf_get_field( $k );
@@ -488,13 +494,14 @@ function acf_form_data( $args = array() ) {
 
 function acf_save_post( $post_id = 0, $values = null ) {
 	
-	// default
+	// override $_POST
-	if( $values === null )
+	if( $values !== null ) {
-		$values = acf_maybe_get_POST('acf');
+		$_POST['acf'] = $values;
-	
+	}
 	
+		
 	// bail early if no values
-	if( empty($values) ) return false;
+	if( empty($_POST['acf']) ) return false;
 	
 	
 	// set form data
@@ -504,7 +511,7 @@ function acf_save_post( $post_id = 0, $values = null ) {
 	
 	
 	// hook for 3rd party customization
-	do_action('acf/save_post', $post_id, $values);
+	do_action('acf/save_post', $post_id);
 	
 	
 	// return

includes/locations/class-acf-location-post.php

@@ -50,6 +50,10 @@ class acf_location_post extends acf_location {
 		$post_id = acf_maybe_get( $screen, 'post_id' );
 		
 		
+		// bail early if not post
+		if( !$post_id ) return false;
+		
+		
 		// compare
 		return $this->compare( $post_id, $rule );
 		

includes/locations/class-acf-location-user-role.php

@@ -51,32 +51,39 @@ class acf_location_user_role extends acf_location {
 		$user_role = acf_maybe_get( $screen, 'user_role' );
 		
 		
-		// not a user
+		// if user_role is supplied (3rd party compatibility)
-		if( !$user_id ) return false;
+		if( $user_role ) {
-		
-		
-		// new user
-		if( $user_id == 'new' ) {
 			
-			$result = ( $rule['value'] == get_option('default_role') );
+			// do nothing
+		
+		// user_id (expected)	
+		} elseif( $user_id ) {
 			
+			// new user
+			if( $user_id == 'new' ) {
+				
+				// set to default role
+				$user_role = get_option('default_role');
+			
+			// existing user
+			} elseif( user_can($user_id, $rule['value']) ) {
+				
+				// set to value and allow match
+				$user_role = $rule['value'];
+				
+			}
+		
+		// else
 		} else {
 			
-			$result = ( user_can($user_id, $rule['value']) );
+			// not a user	
+			return false;
 			
 		}
 		
 		
-		// reverse if 'not equal to'
-        if( $rule['operator'] === '!=' ) {
-	        	
-        	$result = !$result;
-        
-        }
-		
-		
 		// match
-		return $result;
+		return $this->compare( $user_role, $rule );
 		
 	}
 	

lang/acf.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Advanced Custom Fields\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2017-07-17 15:00+1000\n"
+"POT-Creation-Date: 2017-08-01 13:31+1000\n"
 "PO-Revision-Date: 2015-06-11 13:00+1000\n"
 "Last-Translator: Elliot Condon <e@elliotcondon.com>\n"
 "Language-Team: Elliot Condon <e@elliotcondon.com>\n"
@@ -70,7 +70,7 @@ msgstr ""
 #: acf.php:386 includes/admin/admin-field-group.php:182
 #: includes/admin/admin-field-group.php:275
 #: includes/admin/admin-field-groups.php:510
-#: pro/fields/class-acf-field-clone.php:800
+#: pro/fields/class-acf-field-clone.php:823
 msgid "Fields"
 msgstr ""
 
@@ -460,12 +460,12 @@ msgid "Show this field if"
 msgstr ""
 
 #: includes/admin/views/field-group-field-conditional-logic.php:103
-#: includes/locations.php:243
+#: includes/locations.php:247
 msgid "is equal to"
 msgstr ""
 
 #: includes/admin/views/field-group-field-conditional-logic.php:104
-#: includes/locations.php:244
+#: includes/locations.php:248
 msgid "is not equal to"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgid "Full Size"
 msgstr ""
 
 #: includes/api/api-helpers.php:1248 includes/api/api-helpers.php:1831
-#: pro/fields/class-acf-field-clone.php:985
+#: pro/fields/class-acf-field-clone.php:1008
 msgid "(no title)"
 msgstr ""
 
@@ -1249,20 +1249,20 @@ msgid "jQuery"
 msgstr ""
 
 #: includes/fields.php:149 includes/fields/class-acf-field-checkbox.php:384
-#: includes/fields/class-acf-field-group.php:471
+#: includes/fields/class-acf-field-group.php:472
 #: includes/fields/class-acf-field-radio.php:285
-#: pro/fields/class-acf-field-clone.php:832
+#: pro/fields/class-acf-field-clone.php:855
 #: pro/fields/class-acf-field-flexible-content.php:554
 #: pro/fields/class-acf-field-flexible-content.php:603
 #: pro/fields/class-acf-field-repeater.php:458
 msgid "Layout"
 msgstr ""
 
-#: includes/fields.php:305
+#: includes/fields.php:326
 msgid "Field type does not exist"
 msgstr ""
 
-#: includes/fields.php:305
+#: includes/fields.php:326
 msgid "Unknown"
 msgstr ""
 
@@ -1321,14 +1321,14 @@ msgstr ""
 
 #: includes/fields/class-acf-field-checkbox.php:375
 #: includes/fields/class-acf-field-color_picker.php:131
-#: includes/fields/class-acf-field-email.php:109
+#: includes/fields/class-acf-field-email.php:114
-#: includes/fields/class-acf-field-number.php:118
+#: includes/fields/class-acf-field-number.php:123
 #: includes/fields/class-acf-field-radio.php:276
 #: includes/fields/class-acf-field-select.php:377
-#: includes/fields/class-acf-field-text.php:110
+#: includes/fields/class-acf-field-text.php:115
-#: includes/fields/class-acf-field-textarea.php:93
+#: includes/fields/class-acf-field-textarea.php:98
 #: includes/fields/class-acf-field-true_false.php:135
-#: includes/fields/class-acf-field-url.php:91
+#: includes/fields/class-acf-field-url.php:96
 #: includes/fields/class-acf-field-wysiwyg.php:421
 msgid "Default Value"
 msgstr ""
@@ -1566,59 +1566,59 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:110
+#: includes/fields/class-acf-field-email.php:115
-#: includes/fields/class-acf-field-number.php:119
+#: includes/fields/class-acf-field-number.php:124
 #: includes/fields/class-acf-field-radio.php:277
-#: includes/fields/class-acf-field-text.php:111
+#: includes/fields/class-acf-field-text.php:116
-#: includes/fields/class-acf-field-textarea.php:94
+#: includes/fields/class-acf-field-textarea.php:99
-#: includes/fields/class-acf-field-url.php:92
+#: includes/fields/class-acf-field-url.php:97
 #: includes/fields/class-acf-field-wysiwyg.php:422
 msgid "Appears when creating a new post"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:118
+#: includes/fields/class-acf-field-email.php:123
-#: includes/fields/class-acf-field-number.php:127
+#: includes/fields/class-acf-field-number.php:132
-#: includes/fields/class-acf-field-password.php:73
+#: includes/fields/class-acf-field-password.php:71
-#: includes/fields/class-acf-field-text.php:119
+#: includes/fields/class-acf-field-text.php:124
-#: includes/fields/class-acf-field-textarea.php:102
+#: includes/fields/class-acf-field-textarea.php:107
-#: includes/fields/class-acf-field-url.php:100
+#: includes/fields/class-acf-field-url.php:105
 msgid "Placeholder Text"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:119
+#: includes/fields/class-acf-field-email.php:124
-#: includes/fields/class-acf-field-number.php:128
+#: includes/fields/class-acf-field-number.php:133
-#: includes/fields/class-acf-field-password.php:74
+#: includes/fields/class-acf-field-password.php:72
-#: includes/fields/class-acf-field-text.php:120
+#: includes/fields/class-acf-field-text.php:125
-#: includes/fields/class-acf-field-textarea.php:103
+#: includes/fields/class-acf-field-textarea.php:108
-#: includes/fields/class-acf-field-url.php:101
+#: includes/fields/class-acf-field-url.php:106
 msgid "Appears within the input"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:127
+#: includes/fields/class-acf-field-email.php:132
-#: includes/fields/class-acf-field-number.php:136
+#: includes/fields/class-acf-field-number.php:141
-#: includes/fields/class-acf-field-password.php:82
+#: includes/fields/class-acf-field-password.php:80
-#: includes/fields/class-acf-field-text.php:128
+#: includes/fields/class-acf-field-text.php:133
 msgid "Prepend"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:128
+#: includes/fields/class-acf-field-email.php:133
-#: includes/fields/class-acf-field-number.php:137
+#: includes/fields/class-acf-field-number.php:142
-#: includes/fields/class-acf-field-password.php:83
+#: includes/fields/class-acf-field-password.php:81
-#: includes/fields/class-acf-field-text.php:129
+#: includes/fields/class-acf-field-text.php:134
 msgid "Appears before the input"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:136
+#: includes/fields/class-acf-field-email.php:141
-#: includes/fields/class-acf-field-number.php:145
+#: includes/fields/class-acf-field-number.php:150
-#: includes/fields/class-acf-field-password.php:91
+#: includes/fields/class-acf-field-password.php:89
-#: includes/fields/class-acf-field-text.php:137
+#: includes/fields/class-acf-field-text.php:142
 msgid "Append"
 msgstr ""
 
-#: includes/fields/class-acf-field-email.php:137
+#: includes/fields/class-acf-field-email.php:142
-#: includes/fields/class-acf-field-number.php:146
+#: includes/fields/class-acf-field-number.php:151
-#: includes/fields/class-acf-field-password.php:92
+#: includes/fields/class-acf-field-password.php:90
-#: includes/fields/class-acf-field-text.php:138
+#: includes/fields/class-acf-field-text.php:143
 msgid "Appears after the input"
 msgstr ""
 
@@ -1789,32 +1789,32 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: includes/fields/class-acf-field-group.php:455
+#: includes/fields/class-acf-field-group.php:456
 #: pro/fields/class-acf-field-repeater.php:397
 msgid "Sub Fields"
 msgstr ""
 
-#: includes/fields/class-acf-field-group.php:472
+#: includes/fields/class-acf-field-group.php:473
-#: pro/fields/class-acf-field-clone.php:833
+#: pro/fields/class-acf-field-clone.php:856
 msgid "Specify the style used to render the selected fields"
 msgstr ""
 
-#: includes/fields/class-acf-field-group.php:477
+#: includes/fields/class-acf-field-group.php:478
-#: pro/fields/class-acf-field-clone.php:838
+#: pro/fields/class-acf-field-clone.php:861
 #: pro/fields/class-acf-field-flexible-content.php:614
 #: pro/fields/class-acf-field-repeater.php:466
 msgid "Block"
 msgstr ""
 
-#: includes/fields/class-acf-field-group.php:478
+#: includes/fields/class-acf-field-group.php:479
-#: pro/fields/class-acf-field-clone.php:839
+#: pro/fields/class-acf-field-clone.php:862
 #: pro/fields/class-acf-field-flexible-content.php:613
 #: pro/fields/class-acf-field-repeater.php:465
 msgid "Table"
 msgstr ""
 
-#: includes/fields/class-acf-field-group.php:479
+#: includes/fields/class-acf-field-group.php:480
-#: pro/fields/class-acf-field-clone.php:840
+#: pro/fields/class-acf-field-clone.php:863
 #: pro/fields/class-acf-field-flexible-content.php:615
 #: pro/fields/class-acf-field-repeater.php:467
 msgid "Row"
@@ -1843,7 +1843,7 @@ msgid "All images"
 msgstr ""
 
 #: includes/fields/class-acf-field-image.php:127
-#: includes/fields/class-acf-field-link.php:140 includes/input.php:268
+#: includes/fields/class-acf-field-link.php:140 includes/input.php:269
 #: pro/fields/class-acf-field-gallery.php:343
 #: pro/fields/class-acf-field-gallery.php:531
 msgid "Remove"
@@ -1919,27 +1919,27 @@ msgid "Message"
 msgstr ""
 
 #: includes/fields/class-acf-field-message.php:110
-#: includes/fields/class-acf-field-textarea.php:130
+#: includes/fields/class-acf-field-textarea.php:135
 msgid "New Lines"
 msgstr ""
 
 #: includes/fields/class-acf-field-message.php:111
-#: includes/fields/class-acf-field-textarea.php:131
+#: includes/fields/class-acf-field-textarea.php:136
 msgid "Controls how new lines are rendered"
 msgstr ""
 
 #: includes/fields/class-acf-field-message.php:115
-#: includes/fields/class-acf-field-textarea.php:135
+#: includes/fields/class-acf-field-textarea.php:140
 msgid "Automatically add paragraphs"
 msgstr ""
 
 #: includes/fields/class-acf-field-message.php:116
-#: includes/fields/class-acf-field-textarea.php:136
+#: includes/fields/class-acf-field-textarea.php:141
 msgid "Automatically add &lt;br&gt;"
 msgstr ""
 
 #: includes/fields/class-acf-field-message.php:117
-#: includes/fields/class-acf-field-textarea.php:137
+#: includes/fields/class-acf-field-textarea.php:142
 msgid "No Formatting"
 msgstr ""
 
@@ -1955,28 +1955,28 @@ msgstr ""
 msgid "Number"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:154
+#: includes/fields/class-acf-field-number.php:159
 msgid "Minimum Value"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:163
+#: includes/fields/class-acf-field-number.php:168
 msgid "Maximum Value"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:172
+#: includes/fields/class-acf-field-number.php:177
 msgid "Step Size"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:210
+#: includes/fields/class-acf-field-number.php:215
 msgid "Value must be a number"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:228
+#: includes/fields/class-acf-field-number.php:233
 #, php-format
 msgid "Value must be equal to or higher than %d"
 msgstr ""
 
-#: includes/fields/class-acf-field-number.php:236
+#: includes/fields/class-acf-field-number.php:241
 #, php-format
 msgid "Value must be equal to or lower than %d"
 msgstr ""
@@ -2286,7 +2286,7 @@ msgstr ""
 
 #: includes/fields/class-acf-field-taxonomy.php:706
 #: includes/fields/class-acf-field-true_false.php:80
-#: includes/fields/class-acf-field-true_false.php:169 includes/input.php:267
+#: includes/fields/class-acf-field-true_false.php:169 includes/input.php:268
 #: pro/admin/views/html-settings-updates.php:103
 msgid "No"
 msgstr ""
@@ -2378,13 +2378,13 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: includes/fields/class-acf-field-text.php:146
+#: includes/fields/class-acf-field-text.php:151
-#: includes/fields/class-acf-field-textarea.php:111
+#: includes/fields/class-acf-field-textarea.php:116
 msgid "Character Limit"
 msgstr ""
 
-#: includes/fields/class-acf-field-text.php:147
+#: includes/fields/class-acf-field-text.php:152
-#: includes/fields/class-acf-field-textarea.php:112
+#: includes/fields/class-acf-field-textarea.php:117
 msgid "Leave blank for no limit"
 msgstr ""
 
@@ -2392,11 +2392,11 @@ msgstr ""
 msgid "Text Area"
 msgstr ""
 
-#: includes/fields/class-acf-field-textarea.php:120
+#: includes/fields/class-acf-field-textarea.php:125
 msgid "Rows"
 msgstr ""
 
-#: includes/fields/class-acf-field-textarea.php:121
+#: includes/fields/class-acf-field-textarea.php:126
 msgid "Sets the textarea height"
 msgstr ""
 
@@ -2409,7 +2409,7 @@ msgid "True / False"
 msgstr ""
 
 #: includes/fields/class-acf-field-true_false.php:79
-#: includes/fields/class-acf-field-true_false.php:159 includes/input.php:266
+#: includes/fields/class-acf-field-true_false.php:159 includes/input.php:267
 #: pro/admin/views/html-settings-updates.php:93
 msgid "Yes"
 msgstr ""
@@ -2438,7 +2438,7 @@ msgstr ""
 msgid "Url"
 msgstr ""
 
-#: includes/fields/class-acf-field-url.php:142
+#: includes/fields/class-acf-field-url.php:147
 msgid "Value must be a valid URL"
 msgstr ""
 
@@ -2555,7 +2555,11 @@ msgstr ""
 msgid "Restricted"
 msgstr ""
 
-#: includes/input.php:269
+#: includes/input.php:266
+msgid "Are you sure?"
+msgstr ""
+
+#: includes/input.php:270
 msgid "Cancel"
 msgstr ""
 
@@ -2633,7 +2637,7 @@ msgid "Page Template"
 msgstr ""
 
 #: includes/locations/class-acf-location-page-template.php:98
-#: includes/locations/class-acf-location-post-template.php:152
+#: includes/locations/class-acf-location-post-template.php:151
 msgid "Default Template"
 msgstr ""
 
@@ -2677,7 +2681,7 @@ msgstr ""
 msgid "Post Taxonomy"
 msgstr ""
 
-#: includes/locations/class-acf-location-post-template.php:29
+#: includes/locations/class-acf-location-post-template.php:27
 msgid "Post Template"
 msgstr ""
 
@@ -2806,53 +2810,53 @@ msgctxt "noun"
 msgid "Clone"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:801
+#: pro/fields/class-acf-field-clone.php:824
 msgid "Select one or more fields you wish to clone"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:818
+#: pro/fields/class-acf-field-clone.php:841
 msgid "Display"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:819
+#: pro/fields/class-acf-field-clone.php:842
 msgid "Specify the style used to render the clone field"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:824
+#: pro/fields/class-acf-field-clone.php:847
 msgid "Group (displays selected fields in a group within this field)"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:825
+#: pro/fields/class-acf-field-clone.php:848
 msgid "Seamless (replaces this field with selected fields)"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:846
+#: pro/fields/class-acf-field-clone.php:869
 #, php-format
 msgid "Labels will be displayed as %s"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:849
+#: pro/fields/class-acf-field-clone.php:872
 msgid "Prefix Field Labels"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:860
+#: pro/fields/class-acf-field-clone.php:883
 #, php-format
 msgid "Values will be saved as %s"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:863
+#: pro/fields/class-acf-field-clone.php:886
 msgid "Prefix Field Names"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:981
+#: pro/fields/class-acf-field-clone.php:1004
 msgid "Unknown field"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:1020
+#: pro/fields/class-acf-field-clone.php:1043
 msgid "Unknown field group"
 msgstr ""
 
-#: pro/fields/class-acf-field-clone.php:1024
+#: pro/fields/class-acf-field-clone.php:1047
 #, php-format
 msgid "All fields from %s field group"
 msgstr ""

pro/admin/admin-options-page.php

@@ -105,6 +105,10 @@ class acf_admin_options_page {
 		$this->page = acf_get_options_page( $plugin_page );
 		
 		
+		// get post_id (allow lang modification)
+		$this->page['post_id'] = acf_get_valid_post_id($this->page['post_id']);
+		
+		
 		// verify and remove nonce
 		if( acf_verify_nonce('options') ) {
 		

pro/assets/css/acf-pro-input.css

@@ -420,6 +420,9 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   height: 100%;
   transform: translate(50%, 50%);
 }
+html[dir="rtl"] .acf-gallery .acf-gallery-attachment .thumbnail {
+  transform: translate(-50%, 50%);
+}
 .acf-gallery .acf-gallery-attachment .thumbnail img {
   display: block;
   height: auto;
@@ -427,6 +430,9 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   width: auto;
   transform: translate(-50%, -50%);
 }
+html[dir="rtl"] .acf-gallery .acf-gallery-attachment .thumbnail img {
+  transform: translate(50%, -50%);
+}
 .acf-gallery .acf-gallery-attachment .filename {
   position: absolute;
   bottom: 0;
@@ -529,6 +535,10 @@ html[dir="rtl"] .acf-gallery .acf-gallery-attachment {
   content: "";
   display: table;
 }
+html[dir="rtl"] .acf-gallery .acf-gallery-side-info {
+  margin-left: 0;
+  margin-right: -10px;
+}
 .acf-gallery .acf-gallery-side-info img {
   float: left;
   width: auto;
@@ -585,16 +595,15 @@ html[dir="rtl"] .acf-gallery .acf-gallery-side-info img {
   padding: 0 4px 8px 0 !important;
   width: auto !important;
   vertical-align: top;
-  /* rtl */
+}
+html[dir="rtl"] .acf-gallery .acf-gallery-side-data .acf-label,
+html[dir="rtl"] .acf-gallery .acf-gallery-side-data th.label {
+  padding: 0 0 8px 4px !important;
 }
 .acf-gallery .acf-gallery-side-data .acf-label label,
 .acf-gallery .acf-gallery-side-data th.label label {
   font-weight: normal;
 }
-html[dir="rtl"] .acf-gallery .acf-gallery-side-data .acf-label,
-html[dir="rtl"] .acf-gallery .acf-gallery-side-data th.label {
-  text-align: left;
-}
 .acf-gallery .acf-gallery-side-data .acf-input,
 .acf-gallery .acf-gallery-side-data td.field {
   padding: 0 0 8px !important;

pro/assets/js/acf-pro-input.js

@@ -1915,11 +1915,11 @@
 		fetch: function( id ){
 			
 			// vars
-			var data = acf.prepare_for_ajax({
+			var ajaxdata = {
 				action		: 'acf/fields/gallery/get_attachment',
 				field_key	: this.$field.data('key'),
 				id			: id
-			});
+			};
 			
 			
 			// abort XHR if this field is already loading AJAX data
@@ -1942,7 +1942,7 @@
 				
 				
 				// append
-				data.attachment = val;
+				ajaxdata.attachment = val;
 				
 			}
 			
@@ -1953,7 +1953,7 @@
 				dataType	: 'html',
 				type		: 'post',
 				cache		: false,
-				data		: data,
+				data		: acf.prepare_for_ajax(ajaxdata),
 				context		: this,
 				success		: this.fetch_success
 			});
@@ -2024,12 +2024,12 @@
 			
 			
 			// vars
-			var data = acf.prepare_for_ajax({
+			var ajaxdata = {
 				action		: 'acf/fields/gallery/get_sort_order',
 				field_key	: this.$field.data('key'),
 				ids			: [],
 				sort		: sort
-			});
+			};
 			
 			
 			// find and add attachment ids
@@ -2044,7 +2044,7 @@
 				
 				
 				// append
-				data.ids.push(id);
+				ajaxdata.ids.push(id);
 				
 			});
 			
@@ -2055,7 +2055,7 @@
 				dataType:	'json',
 				type:		'post',
 				cache:		false,
-				data:		data,
+				data:		acf.prepare_for_ajax(ajaxdata),
 				context:	this,
 				success:	this._sort_success
 			});
@@ -2105,7 +2105,7 @@
 				$edit = this.$side.find('.acf-gallery-edit'),
 				$form = this.$side.find('.acf-gallery-side-data'),
 				id = $edit.data('id'),
-				data = acf.serialize( $form );
+				ajaxdata = acf.serialize( $form );
 			
 			
 			// validate
@@ -2118,13 +2118,13 @@
 			
 			
 			// append AJAX action		
-			data.action = 'acf/fields/gallery/update_attachment';
+			ajaxdata.action = 'acf/fields/gallery/update_attachment';
 			
 			
 			// ajax
 			$.ajax({
 				url			: acf.get('ajaxurl'),
-				data		: acf.prepare_for_ajax(data),
+				data		: acf.prepare_for_ajax(ajaxdata),
 				type		: 'post',
 				dataType	: 'json',
 				complete	: function( json ){

pro/fields/class-acf-field-repeater.php

@@ -1020,6 +1020,35 @@ class acf_field_repeater extends acf_field {
 	}
 	
 	
+	/*
+	*  validate_any_field
+	*
+	*  This function will add compatibility for the 'column_width' setting
+	*
+	*  @type	function
+	*  @date	30/1/17
+	*  @since	5.5.6
+	*
+	*  @param	$field (array)
+	*  @return	$field
+	*/
+	
+	function validate_any_field( $field ) {
+		
+		// width has changed
+		if( isset($field['column_width']) ) {
+			
+			$field['wrapper']['width'] = acf_extract_var($field, 'column_width');
+			
+		}
+		
+		
+		// return
+		return $field;
+		
+	}
+	
+	
 	/*
 	*  prepare_field_for_export
 	*
@@ -1035,7 +1064,7 @@ class acf_field_repeater extends acf_field {
 	
 	function prepare_field_for_export( $field ) {
 		
-		// bail early if no layouts
+		// bail early if no sub fields
 		if( empty($field['sub_fields']) ) return $field;
 		
 		
@@ -1064,16 +1093,12 @@ class acf_field_repeater extends acf_field {
 	
 	function prepare_field_for_import( $field ) {
 		
-		// bail early if no layouts
+		// bail early if no sub fields
 		if( empty($field['sub_fields']) ) return $field;
 		
 		
-		// var
+		// vars
-		$extra = array();
+		$sub_fields = $field['sub_fields'];
-		
-		
-		// extract sub fields
-		$sub_fields = acf_extract_var( $field, 'sub_fields');
 		
 		
 		// reset field setting
@@ -1081,63 +1106,19 @@ class acf_field_repeater extends acf_field {
 		
 		
 		// loop
-		foreach( array_keys($sub_fields) as $i ) {
+		foreach( $sub_fields as &$sub_field ) {
 			
-			// extract sub field
-			$sub_field = acf_extract_var( $sub_fields, $i );
-					
-			
-			// attributes
 			$sub_field['parent'] = $field['key'];
 			
-			
-			// append to extra
-			$extra[] = $sub_field;
-			
 		}
 		
 		
-		// extra
+		// merge
-		if( !empty($extra) ) {
+		array_unshift($sub_fields, $field);
-			
-			array_unshift($extra, $field);
-			
-			return $extra;
-			
-		}
 		
 		
 		// return
-		return $field;
+		return $sub_fields;
-		
-	}
-	
-	
-	/*
-	*  validate_any_field
-	*
-	*  This function will add compatibility for the 'column_width' setting
-	*
-	*  @type	function
-	*  @date	30/1/17
-	*  @since	5.5.6
-	*
-	*  @param	$field (array)
-	*  @return	$field
-	*/
-	
-	function validate_any_field( $field ) {
-		
-		// width has changed
-		if( isset($field['column_width']) ) {
-			
-			$field['wrapper']['width'] = acf_extract_var($field, 'column_width');
-			
-		}
-		
-		
-		// return
-		return $field;
 		
 	}
 

pro/options-page.php

@@ -83,10 +83,6 @@ class acf_options_page {
 		));
 		
 		
-		// filter post_id
-		$page['post_id'] = acf_get_valid_post_id( $page['post_id'] );
-		
-		
 		// ACF4 compatibility
 		$migrate = array(
 			'title' 	=> 'page_title',

readme.txt

@@ -106,6 +106,9 @@ http://support.advancedcustomfields.com/
 
 == Changelog ==
 
+= 5.6.1 =
+* Fixed an assortment of bugs found in 5.6.0
+
 = 5.6.0 =
 * Link field: Added new field type
 * Group field: Added new field type