rousnay / lighthouse

includes/acf/core/ajax.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Core
 */
 
-if( ! class_exists('acf_ajax') ) :
+if ( ! class_exists('acf_ajax')) :
 
 class acf_ajax {
 	
@@ -31,8 +31,8 @@ 
 	function __construct() {
 		
 		// acf/update_user_setting
-		add_action( 'wp_ajax_acf/update_user_setting',			array($this, 'update_user_setting') );
-		add_action( 'wp_ajax_nopriv_acf/update_user_setting',	array($this, 'update_user_setting') );
+		add_action('wp_ajax_acf/update_user_setting', array($this, 'update_user_setting'));
+		add_action('wp_ajax_nopriv_acf/update_user_setting', array($this, 'update_user_setting'));
 		
 	}
 	
@@ -53,7 +53,7 @@ 
 	function update_user_setting() {
 		
 		// options
-		$options = acf_parse_args( $_POST, array(
+		$options = acf_parse_args($_POST, array(
 			'name'		=> '',
 			'value'		=> '',
 			'nonce'		=> '',
@@ -61,7 +61,7 @@ 
 		
 		
 		// validate
-		if( ! wp_verify_nonce($options['nonce'], 'acf_nonce') || empty($options['name']) ) {
+		if ( ! wp_verify_nonce($options['nonce'], 'acf_nonce') || empty($options['name'])) {
 		
 			die('0');
 			
@@ -69,7 +69,7 @@ 
 		
 		
 		// upadte setting
-		acf_update_user_setting( $options['name'], $options['value'] );
+		acf_update_user_setting($options['name'], $options['value']);
 		
 		
 		// return

includes/acf/core/compatibility.php

Spacing +79 added lines, -79 removed lines

@@ -18,27 +18,27 @@ 
 	function __construct() {
 		
 		// fields
-		add_filter('acf/get_valid_field',					array($this, 'get_valid_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=textarea',		array($this, 'get_valid_textarea_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=relationship',	array($this, 'get_valid_relationship_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=post_object',	array($this, 'get_valid_relationship_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=page_link',	array($this, 'get_valid_relationship_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=image',		array($this, 'get_valid_image_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=file',			array($this, 'get_valid_image_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=wysiwyg',		array($this, 'get_valid_wysiwyg_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=date_picker',	array($this, 'get_valid_date_picker_field'), 20, 1);
-		add_filter('acf/get_valid_field/type=taxonomy',		array($this, 'get_valid_taxonomy_field'), 20, 1);
+		add_filter('acf/get_valid_field', array($this, 'get_valid_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=textarea', array($this, 'get_valid_textarea_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=relationship', array($this, 'get_valid_relationship_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=post_object', array($this, 'get_valid_relationship_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=page_link', array($this, 'get_valid_relationship_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=image', array($this, 'get_valid_image_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=file', array($this, 'get_valid_image_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=wysiwyg', array($this, 'get_valid_wysiwyg_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=date_picker', array($this, 'get_valid_date_picker_field'), 20, 1);
+		add_filter('acf/get_valid_field/type=taxonomy', array($this, 'get_valid_taxonomy_field'), 20, 1);
 		
 		
 		// field groups
-		add_filter('acf/get_valid_field_group',				array($this, 'get_valid_field_group'), 20, 1);
+		add_filter('acf/get_valid_field_group', array($this, 'get_valid_field_group'), 20, 1);
 		
 		
 		// settings
-		add_filter('acf/settings/show_admin',				array($this, 'settings_acf_lite'), 5, 1);
-		add_filter('acf/settings/l10n_textdomain',			array($this, 'settings_export_textdomain'), 5, 1);
-		add_filter('acf/settings/l10n_field',				array($this, 'settings_export_translate'), 5, 1);
-		add_filter('acf/settings/l10n_field_group',			array($this, 'settings_export_translate'), 5, 1);
+		add_filter('acf/settings/show_admin', array($this, 'settings_acf_lite'), 5, 1);
+		add_filter('acf/settings/l10n_textdomain', array($this, 'settings_export_textdomain'), 5, 1);
+		add_filter('acf/settings/l10n_field', array($this, 'settings_export_translate'), 5, 1);
+		add_filter('acf/settings/l10n_field_group', array($this, 'settings_export_translate'), 5, 1);
 		
 	}
 	
@@ -56,10 +56,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function settings_acf_lite( $setting ) {
+	function settings_acf_lite($setting) {
 		
 		// 5.0.0 - removed ACF_LITE
-		if( defined('ACF_LITE') && ACF_LITE ) {
+		if (defined('ACF_LITE') && ACF_LITE) {
 			
 			$setting = false;
 			
@@ -71,17 +71,17 @@ 
 		
 	}
 	
-	function settings_export_textdomain( $setting ) {
+	function settings_export_textdomain($setting) {
 		
 		// 5.3.3 - changed filter name
-		return acf_get_setting( 'export_textdomain', $setting );
+		return acf_get_setting('export_textdomain', $setting);
 		
 	}
 	
-	function settings_export_translate( $setting ) {
+	function settings_export_translate($setting) {
 		
 		// 5.3.3 - changed filter name
-		return acf_get_setting( 'export_translate', $setting );
+		return acf_get_setting('export_translate', $setting);
 		
 	}
 	
@@ -99,17 +99,17 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_field( $field ) {
+	function get_valid_field($field) {
 		
 		// conditional logic has changed
-		if( isset($field['conditional_logic']['status']) ) {
+		if (isset($field['conditional_logic']['status'])) {
 			
 			// extract logic
-			$logic = acf_extract_var( $field, 'conditional_logic' );
+			$logic = acf_extract_var($field, 'conditional_logic');
 			
 			
 			// disabled
-			if( !empty($logic['status']) ) {
+			if ( ! empty($logic['status'])) {
 				
 				// reset
 				$field['conditional_logic'] = array();
@@ -121,12 +121,12 @@ 
 		 		
 		 		
 		 		// loop over rules
-		 		if( !empty($logic['rules']) ) {
+		 		if ( ! empty($logic['rules'])) {
 			 		
-			 		foreach( $logic['rules'] as $rule ) {
+			 		foreach ($logic['rules'] as $rule) {
 				 		
 					 	// sperate groups?
-					 	if( $all_or_any == 'any' ) {
+					 	if ($all_or_any == 'any') {
 					 	
 						 	$group++;
 						 	
@@ -134,7 +134,7 @@ 
 					 	
 					 	
 					 	// add to group
-					 	$field['conditional_logic'][ $group ][] = $rule;
+					 	$field['conditional_logic'][$group][] = $rule;
 			 	
 				 	}
 				 	
@@ -173,7 +173,7 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_relationship_field( $field ) {
+	function get_valid_relationship_field($field) {
 		
 		// force array
 		$field['post_type'] = acf_get_array($field['post_type']);
@@ -181,7 +181,7 @@ 
 		
 		
 		// remove 'all' from post_type
-		if( acf_in_array('all', $field['post_type']) ) {
+		if (acf_in_array('all', $field['post_type'])) {
 			
 			$field['post_type'] = array();
 			
@@ -189,7 +189,7 @@ 
 		
 		
 		// remove 'all' from taxonomy
-		if( acf_in_array('all', $field['taxonomy']) ) {
+		if (acf_in_array('all', $field['taxonomy'])) {
 			
 			$field['taxonomy'] = array();
 			
@@ -197,9 +197,9 @@ 
 		
 		
 		// save_format is now return_format
-		if( !empty($field['result_elements']) ) {
+		if ( ! empty($field['result_elements'])) {
 			
-			$field['elements'] = acf_extract_var( $field, 'result_elements' );
+			$field['elements'] = acf_extract_var($field, 'result_elements');
 			
 		}
 		
@@ -223,12 +223,12 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_textarea_field( $field ) {
+	function get_valid_textarea_field($field) {
 		
 		// formatting has been removed
-		$formatting = acf_extract_var( $field, 'formatting' );
+		$formatting = acf_extract_var($field, 'formatting');
 		
-		if( $formatting === 'br' ) {
+		if ($formatting === 'br') {
 			
 			$field['new_lines'] = 'br';
 			
@@ -253,18 +253,18 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_image_field( $field ) {
+	function get_valid_image_field($field) {
 		
 		// save_format is now return_format
-		if( !empty($field['save_format']) ) {
+		if ( ! empty($field['save_format'])) {
 			
-			$field['return_format'] = acf_extract_var( $field, 'save_format' );
+			$field['return_format'] = acf_extract_var($field, 'save_format');
 			
 		}
 		
 		
 		// object is now array
-		if( $field['return_format'] == 'object' ) {
+		if ($field['return_format'] == 'object') {
 			
 			$field['return_format'] = 'array';
 			
@@ -289,14 +289,14 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_wysiwyg_field( $field ) {
+	function get_valid_wysiwyg_field($field) {
 		
 		// media_upload is now numeric
-		if( $field['media_upload'] === 'yes' ) {
+		if ($field['media_upload'] === 'yes') {
 			
 			$field['media_upload'] = 1;
 			
-		} elseif( $field['media_upload'] === 'no' ) {
+		} elseif ($field['media_upload'] === 'no') {
 			
 			$field['media_upload'] = 0;
 			
@@ -321,19 +321,19 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_date_picker_field( $field ) {
+	function get_valid_date_picker_field($field) {
 		
 		// v4 used date_format
-		if( !empty($field['date_format']) ) {
+		if ( ! empty($field['date_format'])) {
 			
 			// extract vars
-			$date_format = acf_extract_var( $field, 'date_format' );
-			$display_format = acf_extract_var( $field, 'display_format' );
+			$date_format = acf_extract_var($field, 'date_format');
+			$display_format = acf_extract_var($field, 'display_format');
 			
 			
 			// convert from js to php
-			$date_format = acf_convert_date_to_php( $date_format );
-			$display_format = acf_convert_date_to_php( $display_format );
+			$date_format = acf_convert_date_to_php($date_format);
+			$display_format = acf_convert_date_to_php($display_format);
 			
 			
 			// append settings
@@ -362,10 +362,10 @@ 
 	*  @return	$field
 	*/
 	
-	function get_valid_taxonomy_field( $field ) {
+	function get_valid_taxonomy_field($field) {
 		
 		// 5.2.7
-		if( isset($field['load_save_terms']) ) {
+		if (isset($field['load_save_terms'])) {
 			
 			$field['save_terms'] = $field['load_save_terms'];
 			
@@ -391,7 +391,7 @@ 
 	*  @return	$field_group
 	*/
 	
-	function get_valid_field_group( $field_group ) {
+	function get_valid_field_group($field_group) {
 		
 		// global
 		global $wpdb;
@@ -402,20 +402,20 @@ 
 		
 		
 		// add missing 'key' (v5.0.0)
-		if( empty($field_group['key']) ) {
+		if (empty($field_group['key'])) {
 			
 			// update version
 			$v = 4;
 			
 			
 			// add missing key
-			$field_group['key'] = empty($field_group['id']) ? uniqid('group_') : 'group_' . $field_group['id'];
+			$field_group['key'] = empty($field_group['id']) ? uniqid('group_') : 'group_'.$field_group['id'];
 			
 		}
 		
 		
 		// extract options (v5.0.0)
-		if( !empty($field_group['options']) ) {
+		if ( ! empty($field_group['options'])) {
 			
 			$options = acf_extract_var($field_group, 'options');
 			$field_group = array_merge($field_group, $options);
@@ -424,10 +424,10 @@ 
 		
 		
 		// location rules changed to groups (v5.0.0)
-		if( !empty($field_group['location']['rules']) ) {
+		if ( ! empty($field_group['location']['rules'])) {
 			
 			// extract location
-			$location = acf_extract_var( $field_group, 'location' );
+			$location = acf_extract_var($field_group, 'location');
 			
 			
 			// reset location
@@ -440,12 +440,12 @@ 
 	 		
 	 		
 	 		// loop over rules
-	 		if( !empty($location['rules']) ) {
+	 		if ( ! empty($location['rules'])) {
 		 		
-		 		foreach( $location['rules'] as $rule ) {
+		 		foreach ($location['rules'] as $rule) {
 			 		
 				 	// sperate groups?
-				 	if( $all_or_any == 'any' ) {
+				 	if ($all_or_any == 'any') {
 				 	
 					 	$group++;
 					 	
@@ -453,7 +453,7 @@ 
 				 	
 				 	
 				 	// add to group
-				 	$field_group['location'][ $group ][] = $rule;
+				 	$field_group['location'][$group][] = $rule;
 		 	
 			 	}
 			 	
@@ -467,7 +467,7 @@ 
 		
 		
 		// some location rules have changed (v5.0.0)
-		if( !empty($field_group['location']) ) {
+		if ( ! empty($field_group['location'])) {
 			
 			// param changes
 		 	$param_replace = array(
@@ -480,7 +480,7 @@ 
 		 	
 		 	
 		 	// remove conflicting param
-		 	if( $v == 5 ) {
+		 	if ($v == 5) {
 			 	
 			 	unset($param_replace['taxonomy']);
 			 	
@@ -488,14 +488,14 @@ 
 		 	
 		 	
 			// loop over location groups
-			foreach( array_keys($field_group['location']) as $i ) {
+			foreach (array_keys($field_group['location']) as $i) {
 				
 				// extract group
-				$group = acf_extract_var( $field_group['location'], $i );
+				$group = acf_extract_var($field_group['location'], $i);
 				
 				
 				// bail early if group is empty
-				if( empty($group) ) {
+				if (empty($group)) {
 					
 					continue;
 					
@@ -503,28 +503,28 @@ 
 				
 				
 				// loop over group rules
-				foreach( array_keys($group) as $j ) {
+				foreach (array_keys($group) as $j) {
 					
 					// extract rule
-					$rule = acf_extract_var( $group, $j );
+					$rule = acf_extract_var($group, $j);
 					
 					
 					// migrate param
-					if( isset($param_replace[ $rule['param'] ]) ) {
+					if (isset($param_replace[$rule['param']])) {
 						
-						$rule['param'] = $param_replace[ $rule['param'] ];
+						$rule['param'] = $param_replace[$rule['param']];
 						
 					}
 					
 					 	
 				 	// category / taxonomy terms are saved differently
-				 	if( $rule['param'] == 'post_category' || $rule['param'] == 'post_taxonomy' ) {
+				 	if ($rule['param'] == 'post_category' || $rule['param'] == 'post_taxonomy') {
 					 	
-					 	if( is_numeric($rule['value']) ) {
+					 	if (is_numeric($rule['value'])) {
 						 	
 						 	$term_id = $rule['value'];
-						 	$taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id) );
-						 	$term = get_term( $term_id, $taxonomy );
+						 	$taxonomy = $wpdb->get_var($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id));
+						 	$term = get_term($term_id, $taxonomy);
 						 	
 						 	// update rule value
 						 	$rule['value'] = "{$term->taxonomy}:{$term->slug}";
@@ -535,14 +535,14 @@ 
 				 	
 				 	
 				 	// append rule
-				 	$group[ $j ] = $rule;
+				 	$group[$j] = $rule;
 				 	
 				}
 				// foreach
 				
 				
 				// append group
-				$field_group['location'][ $i ] = $group;
+				$field_group['location'][$i] = $group;
 				
 			}
 			// foreach
@@ -552,7 +552,7 @@ 
 		
 		
 		// change layout to style (v5.0.0)
-		if( !empty($field_group['layout']) ) {
+		if ( ! empty($field_group['layout'])) {
 		
 			$field_group['style'] = acf_extract_var($field_group, 'layout');
 			
@@ -560,7 +560,7 @@ 
 		
 		
 		// change no_box to seamless (v5.0.0)
-		if( $field_group['style'] === 'no_box' ) {
+		if ($field_group['style'] === 'no_box') {
 		
 			$field_group['style'] = 'seamless';
 			

includes/acf/core/field.php

Spacing +37 added lines, -37 removed lines

@@ -25,40 +25,40 @@ 
 	function __construct() {
 		
 		// register field
-		add_filter("acf/get_field_types",								array($this, 'get_field_types'), 10, 1);
-		add_filter("acf/get_valid_field/type={$this->name}",			array($this, 'get_valid_field'), 10, 1);
+		add_filter("acf/get_field_types", array($this, 'get_field_types'), 10, 1);
+		add_filter("acf/get_valid_field/type={$this->name}", array($this, 'get_valid_field'), 10, 1);
 		
 		
 		// value
-		$this->add_filter("acf/load_value/type={$this->name}",			array($this, 'load_value'), 10, 3);
-		$this->add_filter("acf/update_value/type={$this->name}",		array($this, 'update_value'), 10, 3);
-		$this->add_filter("acf/format_value/type={$this->name}",		array($this, 'format_value'), 10, 3);
-		$this->add_filter("acf/validate_value/type={$this->name}",		array($this, 'validate_value'), 10, 4);
-		$this->add_action("acf/delete_value/type={$this->name}",		array($this, 'delete_value'), 10, 3);
+		$this->add_filter("acf/load_value/type={$this->name}", array($this, 'load_value'), 10, 3);
+		$this->add_filter("acf/update_value/type={$this->name}", array($this, 'update_value'), 10, 3);
+		$this->add_filter("acf/format_value/type={$this->name}", array($this, 'format_value'), 10, 3);
+		$this->add_filter("acf/validate_value/type={$this->name}", array($this, 'validate_value'), 10, 4);
+		$this->add_action("acf/delete_value/type={$this->name}", array($this, 'delete_value'), 10, 3);
 		
 		
 		// field
-		$this->add_filter("acf/load_field/type={$this->name}",				array($this, 'load_field'), 10, 1);
-		$this->add_filter("acf/update_field/type={$this->name}",			array($this, 'update_field'), 10, 1);
-		$this->add_filter("acf/duplicate_field/type={$this->name}",			array($this, 'duplicate_field'), 10, 1);
-		$this->add_action("acf/delete_field/type={$this->name}",			array($this, 'delete_field'), 10, 1);
-		$this->add_action("acf/render_field/type={$this->name}",			array($this, 'render_field'), 10, 1);
-		$this->add_action("acf/render_field_settings/type={$this->name}",	array($this, 'render_field_settings'), 10, 1);
-		$this->add_action("acf/prepare_field/type={$this->name}",			array($this, 'prepare_field'), 10, 1);
+		$this->add_filter("acf/load_field/type={$this->name}", array($this, 'load_field'), 10, 1);
+		$this->add_filter("acf/update_field/type={$this->name}", array($this, 'update_field'), 10, 1);
+		$this->add_filter("acf/duplicate_field/type={$this->name}", array($this, 'duplicate_field'), 10, 1);
+		$this->add_action("acf/delete_field/type={$this->name}", array($this, 'delete_field'), 10, 1);
+		$this->add_action("acf/render_field/type={$this->name}", array($this, 'render_field'), 10, 1);
+		$this->add_action("acf/render_field_settings/type={$this->name}", array($this, 'render_field_settings'), 10, 1);
+		$this->add_action("acf/prepare_field/type={$this->name}", array($this, 'prepare_field'), 10, 1);
 		
 		
 		// input actions
-		$this->add_action("acf/input/admin_enqueue_scripts",			array($this, 'input_admin_enqueue_scripts'), 10, 0);
-		$this->add_action("acf/input/admin_head",						array($this, 'input_admin_head'), 10, 0);
-		$this->add_action("acf/input/form_data",						array($this, 'input_form_data'), 10, 1);
-		$this->add_filter("acf/input/admin_l10n",						array($this, 'input_admin_l10n'), 10, 1);
-		$this->add_action("acf/input/admin_footer",						array($this, 'input_admin_footer'), 10, 1);
+		$this->add_action("acf/input/admin_enqueue_scripts", array($this, 'input_admin_enqueue_scripts'), 10, 0);
+		$this->add_action("acf/input/admin_head", array($this, 'input_admin_head'), 10, 0);
+		$this->add_action("acf/input/form_data", array($this, 'input_form_data'), 10, 1);
+		$this->add_filter("acf/input/admin_l10n", array($this, 'input_admin_l10n'), 10, 1);
+		$this->add_action("acf/input/admin_footer", array($this, 'input_admin_footer'), 10, 1);
 		
 		
 		// field group actions
-		$this->add_action("acf/field_group/admin_enqueue_scripts", 		array($this, 'field_group_admin_enqueue_scripts'), 10, 0);
-		$this->add_action("acf/field_group/admin_head",					array($this, 'field_group_admin_head'), 10, 0);
-		$this->add_action("acf/field_group/admin_footer",				array($this, 'field_group_admin_footer'), 10, 0);
+		$this->add_action("acf/field_group/admin_enqueue_scripts", array($this, 'field_group_admin_enqueue_scripts'), 10, 0);
+		$this->add_action("acf/field_group/admin_head", array($this, 'field_group_admin_head'), 10, 0);
+		$this->add_action("acf/field_group/admin_footer", array($this, 'field_group_admin_footer'), 10, 0);
 	}
 	
 	
@@ -80,7 +80,7 @@ 
 	
 	function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 		
-		if( is_callable($function_to_add) )
+		if (is_callable($function_to_add))
 		{
 			add_filter($tag, $function_to_add, $priority, $accepted_args);
 		}
@@ -105,7 +105,7 @@ 
 	
 	function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 		
-		if( is_callable($function_to_add) )
+		if (is_callable($function_to_add))
 		{
 			add_action($tag, $function_to_add, $priority, $accepted_args);
 		}
@@ -125,7 +125,7 @@ 
 	*  @return	$fields
 	*/
 	
-	function get_field_types( $fields ) {
+	function get_field_types($fields) {
 		
 		$l10n = array(
 			'basic'			=> __('Basic', 'acf'),
@@ -138,16 +138,16 @@ 
 		
 		
 		// defaults
-		if( !$this->category )
+		if ( ! $this->category)
 		{
 			$this->category = 'basic';
 		}
 		
 		
 		// cat
-		if( isset($l10n[ $this->category ]) )
+		if (isset($l10n[$this->category]))
 		{
-			$cat = $l10n[ $this->category ];
+			$cat = $l10n[$this->category];
 		}
 		else
 		{
@@ -156,7 +156,7 @@ 
 		
 		
 		// add to array
-		$fields[ $cat ][ $this->name ] = $this->label;
+		$fields[$cat][$this->name] = $this->label;
 		
 		
 		// return array
@@ -177,15 +177,15 @@ 
 	*  @return	$field (array)
 	*/
 	
-	function get_valid_field( $field ) {
+	function get_valid_field($field) {
 		
-		if( !empty($this->defaults) )
+		if ( ! empty($this->defaults))
 		{
-			foreach( $this->defaults as $k => $v )
+			foreach ($this->defaults as $k => $v)
 			{
-				if( !isset($field[ $k ]) )
+				if ( ! isset($field[$k]))
 				{
-					$field[ $k ] = $v;
+					$field[$k] = $v;
 				}
 			}
 		}
@@ -207,11 +207,11 @@ 
 	*  @return	$l10n (array)
 	*/
 	
-	function input_admin_l10n( $l10n ) {
+	function input_admin_l10n($l10n) {
 		
-		if( !empty($this->l10n) )
+		if ( ! empty($this->l10n))
 		{
-			$l10n[ $this->name ] = $this->l10n;
+			$l10n[$this->name] = $this->l10n;
 		}
 		
 		return $l10n;

Braces +1 added lines, -2 removed lines

@@ -148,8 +148,7 @@
 		if( isset($l10n[ $this->category ]) )
 		{
 			$cat = $l10n[ $this->category ];
-		}
-		else
+		} else
 		{
 			$cat = $this->category;
 		}

includes/acf/core/input.php

Spacing +64 added lines, -64 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Core
 */
 
-if( ! class_exists('acf_input') ) :
+if ( ! class_exists('acf_input')) :
 
 class acf_input {
 	
@@ -36,14 +36,14 @@ 
 		
 		
 		// actions
-		add_action('acf/save_post', 							array($this, 'save_post'), 10, 1);
-		add_action('acf/input/admin_enqueue_scripts', 			array($this, 'admin_enqueue_scripts'), 10, 0);
-		add_action('acf/input/admin_footer', 					array($this, 'admin_footer'), 10, 0);
+		add_action('acf/save_post', array($this, 'save_post'), 10, 1);
+		add_action('acf/input/admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 10, 0);
+		add_action('acf/input/admin_footer', array($this, 'admin_footer'), 10, 0);
 		
 		
 		// ajax
-		add_action( 'wp_ajax_acf/validate_save_post',			array($this, 'ajax_validate_save_post') );
-		add_action( 'wp_ajax_nopriv_acf/validate_save_post',	array($this, 'ajax_validate_save_post') );
+		add_action('wp_ajax_acf/validate_save_post', array($this, 'ajax_validate_save_post'));
+		add_action('wp_ajax_nopriv_acf/validate_save_post', array($this, 'ajax_validate_save_post'));
 		
 	}
 	
@@ -68,18 +68,18 @@ 
 		
 		
 		// determine action hooks
-		if( $pagenow == 'customize.php' ) {
+		if ($pagenow == 'customize.php') {
 			
 			$this->admin_head = 'customize_controls_print_scripts';
 			$this->admin_footer = 'customize_controls_print_footer_scripts';
 			
-		} elseif( $pagenow == 'wp-login.php' ) { 
+		} elseif ($pagenow == 'wp-login.php') { 
 			
 			$this->admin_enqueue_scripts = 'login_enqueue_scripts';
 			$this->admin_head = 'login_head';
 			$this->admin_footer = 'login_footer';
 			
-		} elseif( !is_admin() ) {
+		} elseif ( ! is_admin()) {
 			
 			$this->admin_enqueue_scripts = 'wp_enqueue_scripts';
 			$this->admin_head = 'wp_head';
@@ -89,9 +89,9 @@ 
 		
 		
 		// actions
-		acf_maybe_add_action($this->admin_enqueue_scripts, 	array($this, 'do_admin_enqueue_scripts'), 20 );
-		acf_maybe_add_action($this->admin_head, 			array($this, 'do_admin_head'), 20 );
-		acf_maybe_add_action($this->admin_footer, 			array($this, 'do_admin_footer'), 20 );
+		acf_maybe_add_action($this->admin_enqueue_scripts, array($this, 'do_admin_enqueue_scripts'), 20);
+		acf_maybe_add_action($this->admin_head, array($this, 'do_admin_head'), 20);
+		acf_maybe_add_action($this->admin_footer, array($this, 'do_admin_footer'), 20);
 				
 	}
 	
@@ -127,25 +127,25 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_post( $post_id = 0 ) {
+	function save_post($post_id = 0) {
 		
 		// bai learly if empty
-		if( empty($_POST['acf']) ) return;
+		if (empty($_POST['acf'])) return;
 		
 		
 		// save $_POST data
-		foreach( $_POST['acf'] as $k => $v ) {
+		foreach ($_POST['acf'] as $k => $v) {
 			
 			// get field
-			$field = acf_get_field( $k );
+			$field = acf_get_field($k);
 			
 			
 			// continue if no field
-			if( !$field ) continue;
+			if ( ! $field) continue;
 			
 			
 			// update
-			acf_update_value( $v, $post_id, $field );
+			acf_update_value($v, $post_id, $field);
 			
 		}
 	
@@ -203,9 +203,9 @@ 
 		// options
 		$o = array(
 			'post_id'		=> $args['post_id'],
-			'nonce'			=> wp_create_nonce( 'acf_nonce' ),
+			'nonce'			=> wp_create_nonce('acf_nonce'),
 			'admin_url'		=> admin_url(),
-			'ajaxurl'		=> admin_url( 'admin-ajax.php' ),
+			'ajaxurl'		=> admin_url('admin-ajax.php'),
 			'ajax'			=> $args['ajax'],
 			'validation'	=> $args['validation'],
 			'wp_version'	=> $wp_version
@@ -213,15 +213,15 @@ 
 		
 		
 		// l10n
-		$l10n = apply_filters( 'acf/input/admin_l10n', array(
-			'unload'				=> __('The changes you made will be lost if you navigate away from this page','acf'),
-			'expand_details' 		=> __('Expand Details','acf'),
-			'collapse_details' 		=> __('Collapse Details','acf'),
+		$l10n = apply_filters('acf/input/admin_l10n', array(
+			'unload'				=> __('The changes you made will be lost if you navigate away from this page', 'acf'),
+			'expand_details' 		=> __('Expand Details', 'acf'),
+			'collapse_details' 		=> __('Collapse Details', 'acf'),
 			'validation_successful'	=> __('Validation successful', 'acf'),
 			'validation_failed'		=> __('Validation failed', 'acf'),
 			'validation_failed_1'	=> __('1 field requires attention', 'acf'),
 			'validation_failed_2'	=> __('%d fields require attention', 'acf'),
-			'restricted'			=> __('Restricted','acf')
+			'restricted'			=> __('Restricted', 'acf')
 		));
 		
 		
@@ -260,7 +260,7 @@ 
 	function ajax_validate_save_post() {
 		
 		// bail early if _acfnonce is missing
-		if( !isset($_POST['_acfnonce']) ) {
+		if ( ! isset($_POST['_acfnonce'])) {
 			
 			wp_send_json_error();
 			
@@ -275,7 +275,7 @@ 
 		
 		
 		// success
-		if( acf_validate_save_post() ) {
+		if (acf_validate_save_post()) {
 			
 			wp_send_json_success($json);
 			
@@ -348,15 +348,15 @@ 
 function acf_enqueue_uploader() {
 	
 	// bail early if doing ajax
-	if( defined('DOING_AJAX') && DOING_AJAX ) return;
+	if (defined('DOING_AJAX') && DOING_AJAX) return;
 	
 	
 	// bail ealry if already run
-	if( acf_has_done('enqueue_uploader') ) return;
+	if (acf_has_done('enqueue_uploader')) return;
 	
 	
 	// enqueue media if user can upload
-	if( current_user_can('upload_files') ) {
+	if (current_user_can('upload_files')) {
 		
 		wp_enqueue_media();
 		
@@ -364,7 +364,7 @@ 
 	
 	
 	// create dummy editor
-	?><div class="acf-hidden"><?php wp_editor( '', 'acf_content' ); ?></div><?php
+	?><div class="acf-hidden"><?php wp_editor('', 'acf_content'); ?></div><?php
 	
 }
 
@@ -382,7 +382,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_form_data( $args = array() ) {
+function acf_form_data($args = array()) {
 	
 	// make sure scripts and styles have been included
 	// case: front end bbPress edit user
@@ -391,10 +391,10 @@ 
 	
 	// defaults
 	$args = acf_parse_args($args, array(
-		'post_id'		=> 0,		// ID of current post
-		'nonce'			=> 'post',	// nonce used for $_POST validation
-		'validation'	=> 1,		// runs AJAX validation
-		'ajax'			=> 0,		// fetches new field groups via AJAX
+		'post_id'		=> 0, // ID of current post
+		'nonce'			=> 'post', // nonce used for $_POST validation
+		'validation'	=> 1, // runs AJAX validation
+		'ajax'			=> 0, // fetches new field groups via AJAX
 	));
 	
 	
@@ -403,7 +403,7 @@ 
 	
 	
 	// enqueue uploader if page allows AJAX fields to appear
-	if( $args['ajax'] ) {
+	if ($args['ajax']) {
 		
 		add_action('admin_footer', 'acf_enqueue_uploader', 1);
 		
@@ -411,7 +411,7 @@ 
 	
 	?>
 	<div id="acf-form-data" class="acf-hidden">
-		<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( $args['nonce'] ); ?>" />
+		<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce($args['nonce']); ?>" />
 		<input type="hidden" name="_acfchanged" value="0" />
 		<?php do_action('acf/input/form_data', $args); ?>
 	</div>
@@ -433,10 +433,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_save_post( $post_id = 0 ) {
+function acf_save_post($post_id = 0) {
 	
 	// bail early if no acf values
-	if( empty($_POST['acf']) ) return false;
+	if (empty($_POST['acf'])) return false;
 	
 	
 	// hook for 3rd party customization
@@ -462,22 +462,22 @@ 
 *  @return	(boolean)
 */
 
-function acf_validate_save_post( $show_errors = false ) {
+function acf_validate_save_post($show_errors = false) {
 	
 	// validate required fields
-	if( !empty($_POST['acf']) ) {
+	if ( ! empty($_POST['acf'])) {
 		
 		$keys = array_keys($_POST['acf']);
 		
 		// loop through and save $_POST data
-		foreach( $keys as $key ) {
+		foreach ($keys as $key) {
 			
 			// get field
-			$field = acf_get_field( $key );
+			$field = acf_get_field($key);
 			
 			
 			// validate
-			acf_validate_value( $_POST['acf'][ $key ], $field, "acf[{$key}]" );
+			acf_validate_value($_POST['acf'][$key], $field, "acf[{$key}]");
 			
 		}
 		// foreach($fields as $key => $value)
@@ -490,21 +490,21 @@ 
 	
 	
 	// check errors
-	if( $errors = acf_get_validation_errors() ) {
+	if ($errors = acf_get_validation_errors()) {
 		
-		if( $show_errors ) {
+		if ($show_errors) {
 			
 			$message = '<h2>Validation failed</h2><ul>';
 			
-			foreach( $errors as $error ) {
+			foreach ($errors as $error) {
 				
-				$message .= '<li>' . $error['message'] . '</li>';
+				$message .= '<li>'.$error['message'].'</li>';
 				
 			}
 			
 			$message .= '</ul>';
 			
-			wp_die( $message, 'Validation failed' );
+			wp_die($message, 'Validation failed');
 			
 		}
 		
@@ -534,18 +534,18 @@ 
 *  @return	(boolean)
 */
 
-function acf_validate_value( $value, $field, $input ) {
+function acf_validate_value($value, $field, $input) {
 	
 	// vars
 	$valid = true;
-	$message = sprintf( __( '%s value is required', 'acf' ), $field['label'] );
+	$message = sprintf(__('%s value is required', 'acf'), $field['label']);
 	
 	
 	// valid
-	if( $field['required'] ) {
+	if ($field['required']) {
 		
 		// valid is set to false if the value is empty, but allow 0 as a valid value
-		if( empty($value) && !is_numeric($value) ) {
+		if (empty($value) && ! is_numeric($value)) {
 			
 			$valid = false;
 			
@@ -555,14 +555,14 @@ 
 	
 	
 	// filter for 3rd party customization
-	$valid = apply_filters( "acf/validate_value", $valid, $value, $field, $input );
-	$valid = apply_filters( "acf/validate_value/type={$field['type']}", $valid, $value, $field, $input );
-	$valid = apply_filters( "acf/validate_value/name={$field['name']}", $valid, $value, $field, $input );
-	$valid = apply_filters( "acf/validate_value/key={$field['key']}", $valid, $value, $field, $input );
+	$valid = apply_filters("acf/validate_value", $valid, $value, $field, $input);
+	$valid = apply_filters("acf/validate_value/type={$field['type']}", $valid, $value, $field, $input);
+	$valid = apply_filters("acf/validate_value/name={$field['name']}", $valid, $value, $field, $input);
+	$valid = apply_filters("acf/validate_value/key={$field['key']}", $valid, $value, $field, $input);
 	
 	
 	// allow $valid to be a custom error message
-	if( !empty($valid) && is_string($valid) ) {
+	if ( ! empty($valid) && is_string($valid)) {
 		
 		$message = $valid;
 		$valid = false;
@@ -570,9 +570,9 @@ 
 	}
 	
 	
-	if( !$valid ) {
+	if ( ! $valid) {
 		
-		acf_add_validation_error( $input, $message );
+		acf_add_validation_error($input, $message);
 		return false;
 		
 	}
@@ -598,10 +598,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_add_validation_error( $input, $message = '' ) {
+function acf_add_validation_error($input, $message = '') {
 	
 	// instantiate array if empty
-	if( empty($GLOBALS['acf_validation_errors']) ) {
+	if (empty($GLOBALS['acf_validation_errors'])) {
 		
 		$GLOBALS['acf_validation_errors'] = array();
 		
@@ -633,7 +633,7 @@ 
 function acf_get_validation_errors() {
 	
 	// bail early if no errors
-	if( empty($GLOBALS['acf_validation_errors']) ) return false;
+	if (empty($GLOBALS['acf_validation_errors'])) return false;
 	
 	
 	// return

Braces +18 added lines, -6 removed lines

@@ -130,7 +130,9 @@ 
 	function save_post( $post_id = 0 ) {
 		
 		// bai learly if empty
-		if( empty($_POST['acf']) ) return;
+		if( empty($_POST['acf']) ) {
+			return;
+		}
 		
 		
 		// save $_POST data
@@ -141,7 +143,9 @@ 
 			
 			
 			// continue if no field
-			if( !$field ) continue;
+			if( !$field ) {
+				continue;
+			}
 			
 			
 			// update
@@ -348,11 +352,15 @@ 
 function acf_enqueue_uploader() {
 	
 	// bail early if doing ajax
-	if( defined('DOING_AJAX') && DOING_AJAX ) return;
+	if( defined('DOING_AJAX') && DOING_AJAX ) {
+		return;
+	}
 	
 	
 	// bail ealry if already run
-	if( acf_has_done('enqueue_uploader') ) return;
+	if( acf_has_done('enqueue_uploader') ) {
+		return;
+	}
 	
 	
 	// enqueue media if user can upload
@@ -436,7 +444,9 @@ 
 function acf_save_post( $post_id = 0 ) {
 	
 	// bail early if no acf values
-	if( empty($_POST['acf']) ) return false;
+	if( empty($_POST['acf']) ) {
+		return false;
+	}
 	
 	
 	// hook for 3rd party customization
@@ -633,7 +643,9 @@ 
 function acf_get_validation_errors() {
 	
 	// bail early if no errors
-	if( empty($GLOBALS['acf_validation_errors']) ) return false;
+	if( empty($GLOBALS['acf_validation_errors']) ) {
+		return false;
+	}
 	
 	
 	// return

includes/acf/core/json.php

Indentation +18 added lines, -18 removed lines

@@ -125,40 +125,40 @@
 			
 			$dir = opendir( $path );
 	    
-		    while(false !== ( $file = readdir($dir)) ) {
+			while(false !== ( $file = readdir($dir)) ) {
 		    
-		    	// only json files
-		    	if( strpos($file, '.json') === false ) {
+				// only json files
+				if( strpos($file, '.json') === false ) {
 		    	
-			    	continue;
+					continue;
 			    	
-		    	}
+				}
 		    	
 		    	
-		    	// read json
-		    	$json = file_get_contents("{$path}/{$file}");
+				// read json
+				$json = file_get_contents("{$path}/{$file}");
 		    	
 		    	
-		    	// validate json
-		    	if( empty($json) ) {
+				// validate json
+				if( empty($json) ) {
 			    	
-			    	continue;
+					continue;
 			    	
-		    	}
+				}
 		    	
 		    	
-		    	// decode
-		    	$json = json_decode($json, true);
+				// decode
+				$json = json_decode($json, true);
 		    	
 		    	
-		    	// add local
-		    	$json['local'] = 'json';
+				// add local
+				$json['local'] = 'json';
 		    	
 		    	
-		    	// add field group
-		    	acf_add_local_field_group( $json );
+				// add field group
+				acf_add_local_field_group( $json );
 		        
-		    }
+			}
 		    
 		}
 		

Spacing +35 added lines, -35 removed lines

@@ -5,17 +5,17 @@ 
 	function __construct() {
 		
 		// update setting
-		acf_update_setting('save_json', get_stylesheet_directory() . '/acf-json');
-		acf_append_setting('load_json', get_stylesheet_directory() . '/acf-json');
+		acf_update_setting('save_json', get_stylesheet_directory().'/acf-json');
+		acf_append_setting('load_json', get_stylesheet_directory().'/acf-json');
 		
 		
 		// actions
-		add_action('acf/update_field_group',		array($this, 'update_field_group'), 10, 5);
-		add_action('acf/duplicate_field_group',		array($this, 'update_field_group'), 10, 5);
-		add_action('acf/untrash_field_group',		array($this, 'update_field_group'), 10, 5);
-		add_action('acf/trash_field_group',			array($this, 'delete_field_group'), 10, 5);
-		add_action('acf/delete_field_group',		array($this, 'delete_field_group'), 10, 5);
-		add_action('acf/include_fields', 			array($this, 'include_fields'), 10, 5);
+		add_action('acf/update_field_group', array($this, 'update_field_group'), 10, 5);
+		add_action('acf/duplicate_field_group', array($this, 'update_field_group'), 10, 5);
+		add_action('acf/untrash_field_group', array($this, 'update_field_group'), 10, 5);
+		add_action('acf/trash_field_group', array($this, 'delete_field_group'), 10, 5);
+		add_action('acf/delete_field_group', array($this, 'delete_field_group'), 10, 5);
+		add_action('acf/include_fields', array($this, 'include_fields'), 10, 5);
 		
 	}
 	
@@ -33,10 +33,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function update_field_group( $field_group ) {
+	function update_field_group($field_group) {
 		
 		// validate
-		if( !acf_get_setting('json') ) {
+		if ( ! acf_get_setting('json')) {
 		
 			return;
 			
@@ -44,11 +44,11 @@ 
 		
 		
 		// get fields
-		$field_group['fields'] = acf_get_fields( $field_group );
+		$field_group['fields'] = acf_get_fields($field_group);
 		
 		
 		// save file
-		acf_write_json_field_group( $field_group );
+		acf_write_json_field_group($field_group);
 			
 	}
 	
@@ -66,17 +66,17 @@ 
 	*  @return	n/a
 	*/
 	
-	function delete_field_group( $field_group ) {
+	function delete_field_group($field_group) {
 		
 		// validate
-		if( !acf_get_setting('json') ) {
+		if ( ! acf_get_setting('json')) {
 		
 			return;
 			
 		}
 		
 		
-		acf_delete_json_field_group( $field_group['key'] );
+		acf_delete_json_field_group($field_group['key']);
 		
 	}
 		
@@ -97,7 +97,7 @@ 
 	function include_fields() {
 		
 		// validate
-		if( !acf_get_setting('json') ) {
+		if ( ! acf_get_setting('json')) {
 		
 			return;
 			
@@ -109,26 +109,26 @@ 
 		
 		
 		// loop through and add to cache
-		foreach( $paths as $path ) {
+		foreach ($paths as $path) {
 			
 			// remove trailing slash
-			$path = untrailingslashit( $path );
+			$path = untrailingslashit($path);
 		
 		
 			// check that path exists
-			if( !file_exists( $path ) ) {
+			if ( ! file_exists($path)) {
 			
 				continue;
 				
 			}
 			
 			
-			$dir = opendir( $path );
+			$dir = opendir($path);
 	    
-		    while(false !== ( $file = readdir($dir)) ) {
+		    while (false !== ($file = readdir($dir))) {
 		    
 		    	// only json files
-		    	if( strpos($file, '.json') === false ) {
+		    	if (strpos($file, '.json') === false) {
 		    	
 			    	continue;
 			    	
@@ -140,7 +140,7 @@ 
 		    	
 		    	
 		    	// validate json
-		    	if( empty($json) ) {
+		    	if (empty($json)) {
 			    	
 			    	continue;
 			    	
@@ -156,7 +156,7 @@ 
 		    	
 		    	
 		    	// add field group
-		    	acf_add_local_field_group( $json );
+		    	acf_add_local_field_group($json);
 		        
 		    }
 		    
@@ -182,24 +182,24 @@ 
 *  @return	(boolean)
 */
 
-function acf_write_json_field_group( $field_group ) {
+function acf_write_json_field_group($field_group) {
 	
 	// vars
 	$path = acf_get_setting('save_json');
-	$file = $field_group['key'] . '.json';
+	$file = $field_group['key'].'.json';
 	
 	
 	// remove trailing slash
-	$path = untrailingslashit( $path );
+	$path = untrailingslashit($path);
 	
 	
 	// bail early if dir does not exist
-	if( !is_writable($path) ) return false;
+	if ( ! is_writable($path)) return false;
 	
 	
 	// prepare for export
-	$id = acf_extract_var( $field_group, 'ID' );
-	$field_group = acf_prepare_field_group_for_export( $field_group );
+	$id = acf_extract_var($field_group, 'ID');
+	$field_group = acf_prepare_field_group_for_export($field_group);
 	
 
 	// add modified time
@@ -208,7 +208,7 @@ 
 	
 	// write file
 	$f = fopen("{$path}/{$file}", 'w');
-	fwrite($f, acf_json_encode( $field_group ));
+	fwrite($f, acf_json_encode($field_group));
 	fclose($f);
 	
 	
@@ -231,19 +231,19 @@ 
 *  @return	(boolean)
 */
 
-function acf_delete_json_field_group( $key ) {
+function acf_delete_json_field_group($key) {
 	
 	// vars
 	$path = acf_get_setting('save_json');
-	$file = $key . '.json';
+	$file = $key.'.json';
 	
 	
 	// remove trailing slash
-	$path = untrailingslashit( $path );
+	$path = untrailingslashit($path);
 	
 	
 	// bail early if file does not exist
-	if( !is_readable("{$path}/{$file}") ) {
+	if ( ! is_readable("{$path}/{$file}")) {
 	
 		return false;
 		

Braces +3 added lines, -1 removed lines

@@ -194,7 +194,9 @@
 	
 	
 	// bail early if dir does not exist
-	if( !is_writable($path) ) return false;
+	if( !is_writable($path) ) {
+		return false;
+	}
 	
 	
 	// prepare for export

includes/acf/core/local.php

Indentation +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 			
 			foreach( $field_groups as $key => $row ) {
 				
-			    $menu_order[ $key ] = $row['menu_order'];
-			    $title[ $key ] = $row['title'];
+				$menu_order[ $key ] = $row['menu_order'];
+				$title[ $key ] = $row['title'];
 			}
 			
 			

Spacing +87 added lines, -87 removed lines

@@ -3,16 +3,16 @@ 
 class acf_local {
 	
 	// vars
-	var $enabled	= true,
+	var $enabled = true,
 		$groups 	= array(),
 		$fields 	= array(),
-		$parents 	= array();
+		$parents = array();
 		
 		
 	function __construct() {
 		
 		add_filter('acf/get_field_groups', array($this, 'get_field_groups'), 10, 1);
-		add_action('acf/delete_field', 	array($this, 'delete_field'), 10, 1);
+		add_action('acf/delete_field', array($this, 'delete_field'), 10, 1);
 		
 	}
 	
@@ -30,10 +30,10 @@ 
 	*  @return	$field_groups
 	*/
 	
-	function get_field_groups( $field_groups ) {
+	function get_field_groups($field_groups) {
 		
 		// validate
-		if( !acf_have_local_field_groups() ) {
+		if ( ! acf_have_local_field_groups()) {
 			
 			return $field_groups;
 			
@@ -46,9 +46,9 @@ 
 		
 		
 		// populate ignore list
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
-			foreach( $field_groups as $k => $group ) {
+			foreach ($field_groups as $k => $group) {
 
 				$ignore[] = $group['key'];
 				
@@ -60,10 +60,10 @@ 
 		// append field groups
 		$groups = acf_get_local_field_groups();
 		
-		foreach( $groups as $group ) {
+		foreach ($groups as $group) {
 			
 			// is ignore
-			if( in_array($group['key'], $ignore) ) {
+			if (in_array($group['key'], $ignore)) {
 				
 				continue;
 					
@@ -78,20 +78,20 @@ 
 		
 		
 		// order field groups based on menu_order, title
-		if( $added ) {
+		if ($added) {
 			
 			$menu_order = array();
 			$title = array();
 			
-			foreach( $field_groups as $key => $row ) {
+			foreach ($field_groups as $key => $row) {
 				
-			    $menu_order[ $key ] = $row['menu_order'];
-			    $title[ $key ] = $row['title'];
+			    $menu_order[$key] = $row['menu_order'];
+			    $title[$key] = $row['title'];
 			}
 			
 			
 			// sort the array with menu_order ascending
-			array_multisort( $menu_order, SORT_ASC, $title, SORT_ASC, $field_groups );
+			array_multisort($menu_order, SORT_ASC, $title, SORT_ASC, $field_groups);
 				
 		}
 		
@@ -115,9 +115,9 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_field( $field ) {
+	function delete_field($field) {
 		
-		$this->remove_field( $field['key'] );
+		$this->remove_field($field['key']);
 		
 	}
 	
@@ -135,14 +135,14 @@ 
 	*  @return	n/a
 	*/
 	
-	function add_field_group( $field_group ) {
+	function add_field_group($field_group) {
 		
 		// validate
 		$field_group = acf_get_valid_field_group($field_group);
 		
 		
 		// don't allow overrides
-		if( acf_is_local_field_group($field_group['key']) ) {
+		if (acf_is_local_field_group($field_group['key'])) {
 			
 			return;	
 			
@@ -150,7 +150,7 @@ 
 		
 		
 		// add local
-		if( empty($field_group['local']) ) {
+		if (empty($field_group['local'])) {
 			
 			$field_group['local'] = 'php';
 			
@@ -162,18 +162,18 @@ 
 		
 		
 		// format fields
-		$fields = acf_prepare_fields_for_import( $fields );
+		$fields = acf_prepare_fields_for_import($fields);
 		
 		
 		// add field group
-		$this->groups[ $field_group['key'] ] = $field_group;
+		$this->groups[$field_group['key']] = $field_group;
 		
 		
 		// add fields
-		foreach( $fields as $field ) {
+		foreach ($fields as $field) {
 			
 			// add parent
-			if( empty($field['parent']) ) {
+			if (empty($field['parent'])) {
 				
 				$field['parent'] = $field_group['key'];
 				
@@ -181,7 +181,7 @@ 
 			
 			
 			// add field
-			$this->add_field( $field );
+			$this->add_field($field);
 			
 		}
 		
@@ -201,7 +201,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function add_field( $field ) {
+	function add_field($field) {
 		
 		// vars
 		// - allow for the very unexpected case where no key or parent exist
@@ -210,20 +210,20 @@ 
 		
 		
 		// add parent reference
-		$this->add_parent_reference( $parent, $key );
+		$this->add_parent_reference($parent, $key);
 		
 		
 		// add in menu order
-		$field['menu_order'] = count( $this->parents[ $parent ] ) - 1;
+		$field['menu_order'] = count($this->parents[$parent]) - 1;
 		
 		
 		// add field
-		$this->fields[ $key ] = $field;
+		$this->fields[$key] = $field;
 		
 		
 		// clear cache
-		wp_cache_delete( "get_field/key={$key}", 'acf' );
-		wp_cache_delete( "get_fields/parent={$parent}", 'acf' );
+		wp_cache_delete("get_field/key={$key}", 'acf');
+		wp_cache_delete("get_fields/parent={$parent}", 'acf');
 		
 	}
 	
@@ -241,38 +241,38 @@ 
 	*  @return	n/a
 	*/
 	
-	function remove_field( $key ) {
+	function remove_field($key) {
 		
 		// get field
-		$field = acf_get_field( $key );
+		$field = acf_get_field($key);
 		
 		
 		// remove parent reference
-		$this->remove_parent_reference( $field['parent'], $field['key'] );
+		$this->remove_parent_reference($field['parent'], $field['key']);
 		
 		
 		// remove field
-		unset( $this->fields[ $key ] );
+		unset($this->fields[$key]);
 		
 		
 		// remove children
-		if( acf_have_local_fields( $key) ) {
+		if (acf_have_local_fields($key)) {
 			
-			acf_remove_local_fields( $key );
+			acf_remove_local_fields($key);
 			
 		}
 		
 	}
 	
 	
-	function add_parent_reference( $parent_key, $field_key ) {
+	function add_parent_reference($parent_key, $field_key) {
 		
 		// create array
-		if( !isset($this->parents[ $parent_key ]) ) {
+		if ( ! isset($this->parents[$parent_key])) {
 			
-			$this->parents[ $parent_key ] = array();
+			$this->parents[$parent_key] = array();
 			
-		} elseif( in_array($field_key, $this->parents[ $parent_key ]) ) {
+		} elseif (in_array($field_key, $this->parents[$parent_key])) {
 			
 			// bail early if already in array
 			return false;
@@ -281,7 +281,7 @@ 
 		
 		
 		// append
-		$this->parents[ $parent_key ][] = $field_key;
+		$this->parents[$parent_key][] = $field_key;
 		
 		
 		// return
@@ -290,10 +290,10 @@ 
 	}
 	
 	
-	function remove_parent_reference( $parent_key, $field_key ) {
+	function remove_parent_reference($parent_key, $field_key) {
 		
 		// bail early if no parent
-		if( !isset($this->parents[ $parent_key ]) ) {
+		if ( ! isset($this->parents[$parent_key])) {
 			
 			return false;
 			
@@ -301,7 +301,7 @@ 
 		
 		
 		// remove
-		$this->parents[ $parent_key ] = array_diff($this->parents[ $parent_key ], array($field_key));
+		$this->parents[$parent_key] = array_diff($this->parents[$parent_key], array($field_key));
 		
 		
 		// return
@@ -332,7 +332,7 @@ 
 	
 	
 	// instantiate
-	if( !isset($acf_local) )
+	if ( ! isset($acf_local))
 	{
 		$acf_local = new acf_local();
 	}
@@ -399,14 +399,14 @@ 
 function acf_is_local_enabled() {
 	
 	// validate
-	if( !acf_get_setting('local') ) {
+	if ( ! acf_get_setting('local')) {
 		
 		return false;
 		
 	}
 	
 	
-	if( !acf_local()->enabled ) {
+	if ( ! acf_local()->enabled) {
 		
 		return false;
 		
@@ -432,20 +432,20 @@ 
 *  @return	(int)
 */
 
-function acf_count_local_field_groups( $type = '' ) {
+function acf_count_local_field_groups($type = '') {
 	
 	// vars
 	$count = 0;
 	
 	
 	// check for groups
-	if( !empty(acf_local()->groups) ) {
+	if ( ! empty(acf_local()->groups)) {
 		
 		// acf_local
-		foreach( acf_local()->groups as $group ) {
+		foreach (acf_local()->groups as $group) {
 			
 			// ignore if not specific type
-			if( $type && $group['local'] != $type ) {
+			if ($type && $group['local'] != $type) {
 				
 				continue;
 				
@@ -480,7 +480,7 @@ 
 function acf_have_local_field_groups() {
 	
 	// validate
-	if( !acf_is_local_enabled() ) {
+	if ( ! acf_is_local_enabled()) {
 		
 		return false;
 		
@@ -488,7 +488,7 @@ 
 	
 	
 	// check for groups
-	if( !empty(acf_local()->groups) ) {
+	if ( ! empty(acf_local()->groups)) {
 		
 		return true;
 		
@@ -517,7 +517,7 @@ 
 function acf_get_local_field_groups() {
 	
 	// bail early if no groups
-	if( !acf_have_local_field_groups() ) {
+	if ( ! acf_have_local_field_groups()) {
 		
 		return false;
 		
@@ -529,7 +529,7 @@ 
 	
 	
 	// acf_local
-	foreach( acf_local()->groups as $group ) {
+	foreach (acf_local()->groups as $group) {
 		
 		$groups[] = $group;
 		
@@ -555,9 +555,9 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_add_local_field_group( $field_group ) {
+function acf_add_local_field_group($field_group) {
 	
-	acf_local()->add_field_group( $field_group );
+	acf_local()->add_field_group($field_group);
 	
 }
 
@@ -575,10 +575,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_is_local_field_group( $key ) {
+function acf_is_local_field_group($key) {
 	
 	// validate
-	if( !acf_is_local_enabled() ) {
+	if ( ! acf_is_local_enabled()) {
 		
 		return false;
 		
@@ -586,7 +586,7 @@ 
 	
 	
 	// check groups
-	if( isset( acf_local()->groups[ $key ] ) ) {
+	if (isset(acf_local()->groups[$key])) {
 		
 		return true;
 		
@@ -612,10 +612,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_get_local_field_group( $key ) {
+function acf_get_local_field_group($key) {
 	
 	// bail early if no group
-	if( !acf_is_local_field_group($key) ) {
+	if ( ! acf_is_local_field_group($key)) {
 		
 		return false;
 		
@@ -623,7 +623,7 @@ 
 	
 	
 	// return
-	return acf_local()->groups[ $key ];
+	return acf_local()->groups[$key];
 	
 }
 
@@ -641,9 +641,9 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_add_local_field( $field ) {
+function acf_add_local_field($field) {
 	
-	acf_local()->add_field( $field );
+	acf_local()->add_field($field);
 	
 }
 
@@ -661,9 +661,9 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_remove_local_field( $key ) {
+function acf_remove_local_field($key) {
 	
-	acf_local()->remove_field( $key );
+	acf_local()->remove_field($key);
 	
 }
 
@@ -681,10 +681,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_is_local_field( $key ) {
+function acf_is_local_field($key) {
 	
 	// validate
-	if( !acf_is_local_enabled() ) {
+	if ( ! acf_is_local_enabled()) {
 		
 		return false;
 		
@@ -692,7 +692,7 @@ 
 	
 	
 	// check fields
-	if( isset( acf_local()->fields[ $key ] ) ) {
+	if (isset(acf_local()->fields[$key])) {
 		
 		return true;
 		
@@ -718,10 +718,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_get_local_field( $key ) {
+function acf_get_local_field($key) {
 	
 	// bail early if no field
-	if( !acf_is_local_field($key) ) {
+	if ( ! acf_is_local_field($key)) {
 		
 		return false;
 		
@@ -729,7 +729,7 @@ 
 	
 	
 	// return
-	return acf_local()->fields[ $key ];
+	return acf_local()->fields[$key];
 	
 }
 
@@ -747,12 +747,12 @@ 
 *  @return	(int)
 */
 
-function acf_count_local_fields( $key ) {
+function acf_count_local_fields($key) {
 	
 	// check for fields
-	if( !empty(acf_local()->parents[ $key ]) ) {
+	if ( ! empty(acf_local()->parents[$key])) {
 		
-		return count( acf_local()->parents[ $key ] );
+		return count(acf_local()->parents[$key]);
 		
 	}
 	
@@ -776,10 +776,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_have_local_fields( $key ) {
+function acf_have_local_fields($key) {
 
 	// validate
-	if( !acf_is_local_enabled() ) {
+	if ( ! acf_is_local_enabled()) {
 		
 		return false;
 		
@@ -787,7 +787,7 @@ 
 	
 	
 	// check parents
-	if( isset( acf_local()->parents[ $key ] ) ) {
+	if (isset(acf_local()->parents[$key])) {
 		
 		return true;
 		
@@ -813,10 +813,10 @@ 
 *  @return	(bolean)
 */
 
-function acf_get_local_fields( $parent ) {
+function acf_get_local_fields($parent) {
 	
 	// bail early if no parent
-	if( !acf_have_local_fields($parent) ) {
+	if ( ! acf_have_local_fields($parent)) {
 		
 		return false;
 		
@@ -828,9 +828,9 @@ 
 	
 	
 	// append
-	foreach( acf_local()->parents[ $parent ] as $key ) {
+	foreach (acf_local()->parents[$parent] as $key) {
 		
-		$fields[] = acf_get_field( $key );
+		$fields[] = acf_get_field($key);
 		
 	}
 	
@@ -854,19 +854,19 @@ 
 *  @return	(bolean)
 */
 
-function acf_remove_local_fields( $parent ) {
+function acf_remove_local_fields($parent) {
 	
 	// bail early if no reference
-	if( empty( acf_local()->parents[ $parent ] ) ) {
+	if (empty(acf_local()->parents[$parent])) {
 		
 		return false;
 		
 	}
 	
 	
-	foreach( acf_local()->parents[ $parent ] as $key ) {
+	foreach (acf_local()->parents[$parent] as $key) {
 		
-		acf_remove_local_field( $key );
+		acf_remove_local_field($key);
 	
 	}
 	

includes/acf/core/location.php

Indentation +226 added lines, -226 removed lines

@@ -83,15 +83,15 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+		if( $rule['operator'] == "==" ) {
         	
-        	$match = ( $post_type === $rule['value'] );
+			$match = ( $post_type === $rule['value'] );
         	
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $post_type !== $rule['value'] );
+			$match = ( $post_type !== $rule['value'] );
         	
-        }
+		}
         
 		
 		// return
@@ -169,13 +169,13 @@ 
 		}
 		
 		
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
-    /*
+	/*
 	*  rule_match_current_user_role
 	*
 	*  This function will match a location rule and return true or false
@@ -204,7 +204,7 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+		if( $rule['operator'] == "==" ) {
         	
 			if( $rule['value'] == 'super_admin' ) {
 				
@@ -231,10 +231,10 @@ 
 		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
 	/*
@@ -274,19 +274,19 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==") {
+		if( $rule['operator'] == "==") {
         	
-        	$match = ( $options['post_id'] == $rule['value'] );
+			$match = ( $options['post_id'] == $rule['value'] );
         
-        } elseif( $rule['operator'] == "!=") {
+		} elseif( $rule['operator'] == "!=") {
         	
-        	$match = ( $options['post_id'] != $rule['value'] );
+			$match = ( $options['post_id'] != $rule['value'] );
         
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
 
 	}
 	
@@ -371,21 +371,21 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==") {
+		if( $rule['operator'] == "==") {
         	
-        	$match = in_array($term->term_id, $terms);
+			$match = in_array($term->term_id, $terms);
         
-        } elseif( $rule['operator'] == "!=") {
+		} elseif( $rule['operator'] == "!=") {
         	
-        	$match = !in_array($term->term_id, $terms);
+			$match = !in_array($term->term_id, $terms);
         
-        }		
+		}		
             
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
 	
 	
 	/*
@@ -443,25 +443,25 @@ 
 		}
 
        	
-       	// compare
-        if( $rule['operator'] == "==") {
+	   	// compare
+		if( $rule['operator'] == "==") {
         	
-        	$match = ( $post_format === $rule['value'] );
+			$match = ( $post_format === $rule['value'] );
         
-        } elseif( $rule['operator'] == "!=") {
+		} elseif( $rule['operator'] == "!=") {
         	
-        	$match = ( $post_format !== $rule['value'] );
+			$match = ( $post_format !== $rule['value'] );
         
-        }
+		}
         
         
-        // return        
-        return $match;
+		// return        
+		return $match;
         
-    }
+	}
     
     
-    /*
+	/*
 	*  rule_match_post_status
 	*
 	*  This function will match a location rule and return true or false
@@ -489,30 +489,30 @@ 
 		$post_status = get_post_status( $options['post_id'] );
 	    
 	    
-	    // auto-draft = draft
-	    if( $post_status == 'auto-draft' )  {
+		// auto-draft = draft
+		if( $post_status == 'auto-draft' )  {
 	    
-		    $post_status = 'draft';
+			$post_status = 'draft';
 		    
-	    }
+		}
 	    
 	    
-	    // compare
-        if( $rule['operator'] == "==") {
+		// compare
+		if( $rule['operator'] == "==") {
         	
-        	$match = ( $post_status === $rule['value'] );
+			$match = ( $post_status === $rule['value'] );
         
-        } elseif( $rule['operator'] == "!=") {
+		} elseif( $rule['operator'] == "!=") {
         	
-        	$match = ( $post_status !== $rule['value'] );
+			$match = ( $post_status !== $rule['value'] );
         
-        }
+		}
         
         
-        // return
-	    return $match;
+		// return
+		return $match;
         
-    }
+	}
 
 
 	/*
@@ -544,115 +544,115 @@ 
 		
 		
 		// compare   
-        if( $rule['value'] == 'front_page') {
+		if( $rule['value'] == 'front_page') {
         	
-        	// vars
-	        $front_page = (int) get_option('page_on_front');
+			// vars
+			$front_page = (int) get_option('page_on_front');
 	        
 	        
-	         // compare
-	        if( $rule['operator'] == "==" ) {
+			 // compare
+			if( $rule['operator'] == "==" ) {
 	        	
-	        	$match = ( $front_page == $post->ID );
+				$match = ( $front_page == $post->ID );
 	        	
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( $front_page != $post->ID );
+				$match = ( $front_page != $post->ID );
 	        
-	        }
+			}
 	        
-        } elseif( $rule['value'] == 'posts_page') {
+		} elseif( $rule['value'] == 'posts_page') {
         	
-        	// vars
-	        $posts_page = (int) get_option('page_for_posts');
+			// vars
+			$posts_page = (int) get_option('page_for_posts');
 	        
 	        
-	        // compare
-	        if( $rule['operator'] == "==" ) {
+			// compare
+			if( $rule['operator'] == "==" ) {
 	        
-	        	$match = ( $posts_page == $post->ID );
+				$match = ( $posts_page == $post->ID );
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( $posts_page != $post->ID );
+				$match = ( $posts_page != $post->ID );
 	        	
-	        }
+			}
 	        
-        } elseif( $rule['value'] == 'top_level') {
+		} elseif( $rule['value'] == 'top_level') {
         	
-        	// vars
-        	$post_parent = $post->post_parent;
+			// vars
+			$post_parent = $post->post_parent;
         	
         	
-        	// override
-        	if( $options['page_parent'] ) {
+			// override
+			if( $options['page_parent'] ) {
 	        	
-	        	$post_parent = $options['page_parent'];
+				$post_parent = $options['page_parent'];
 	        	
-        	}
+			}
         	
         	
-        	// compare
-	        if( $rule['operator'] == "==" ) {
+			// compare
+			if( $rule['operator'] == "==" ) {
 	        
-	        	$match = ( $post_parent == 0 );
+				$match = ( $post_parent == 0 );
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( $post_parent != 0 );
+				$match = ( $post_parent != 0 );
 	        	
-	        }
+			}
 	            
-        } elseif( $rule['value'] == 'parent' ) {
+		} elseif( $rule['value'] == 'parent' ) {
         	
-        	// get children
-        	$children = get_pages(array(
-        		'post_type' => $post->post_type,
-        		'child_of' =>  $post->ID,
-        	));
+			// get children
+			$children = get_pages(array(
+				'post_type' => $post->post_type,
+				'child_of' =>  $post->ID,
+			));
         	
 	        
-	        // compare
-	        if( $rule['operator'] == "==" ) {
+			// compare
+			if( $rule['operator'] == "==" ) {
 	        
-	        	$match = ( count($children) > 0 );
+				$match = ( count($children) > 0 );
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( count($children) == 0 );
+				$match = ( count($children) == 0 );
 	        	
-	        }
+			}
 	        
-        } elseif( $rule['value'] == 'child') {
+		} elseif( $rule['value'] == 'child') {
         	
-        	// vars
-        	$post_parent = $post->post_parent;
+			// vars
+			$post_parent = $post->post_parent;
         	
         	
-        	// override
-        	if( $options['page_parent'] ) {
+			// override
+			if( $options['page_parent'] ) {
         	
-	        	$post_parent = $options['page_parent'];
+				$post_parent = $options['page_parent'];
 	        	
-        	}
+			}
 	        
 	        
-	        // compare
-	        if( $rule['operator'] == "==" ) {
+			// compare
+			if( $rule['operator'] == "==" ) {
 	        
-	        	$match = ( $post_parent != 0 );
+				$match = ( $post_parent != 0 );
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( $post_parent == 0 );
+				$match = ( $post_parent == 0 );
 	        	
-	        }
+			}
 	        
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
 
 	}
 	
@@ -687,27 +687,27 @@ 
 		
 		// post parent
 		$post_parent = $post->post_parent;
-    	if( $options['page_parent'] ) {
+		if( $options['page_parent'] ) {
     	
-        	$post_parent = $options['page_parent'];
+			$post_parent = $options['page_parent'];
         	
-    	}
+		}
         
         
-        // compare
-        if( $rule['operator'] == "==" ) {
+		// compare
+		if( $rule['operator'] == "==" ) {
         
-        	$match = ( $post_parent == $rule['value'] );
+			$match = ( $post_parent == $rule['value'] );
         
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $post_parent != $rule['value'] );
+			$match = ( $post_parent != $rule['value'] );
         	
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
 
 	}
 	
@@ -760,24 +760,24 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+		if( $rule['operator'] == "==" ) {
         
-        	$match = ( $page_template === $rule['value'] );
+			$match = ( $page_template === $rule['value'] );
         
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $page_template !== $rule['value'] );
+			$match = ( $page_template !== $rule['value'] );
         	
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
 
 	}
 	
 	
-    /*
+	/*
 	*  rule_match_user_form
 	*
 	*  This function will match a location rule and return true or false
@@ -791,7 +791,7 @@ 
 	*  @return	$options (array)
 	*/
     
-    function rule_match_user_form( $match, $rule, $options ) {
+	function rule_match_user_form( $match, $rule, $options ) {
 		
 		// vars
 		$user_form = $options['user_form'];
@@ -810,39 +810,39 @@ 
 		
 			if( $rule['operator'] == "==" ) {
 				
-	        	$match = ( $user_form == $rule['value'] );
+				$match = ( $user_form == $rule['value'] );
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 					
 					$match = true;
 				
 				}
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	$match = ( $user_form != $rule['value'] );
+				$match = ( $user_form != $rule['value'] );
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 		        
 					$match = false;
 					
 				}
 				
-	        }
+			}
 	        
 		}
 		
         
-        // return
-        return $match;
-    }
+		// return
+		return $match;
+	}
     
     
-    /*
+	/*
 	*  rule_match_user_role
 	*
 	*  This function will match a location rule and return true or false
@@ -868,97 +868,97 @@ 
 		
 			if( $rule['operator'] == "==" ) {
 			
-	        	if( $user_role === $rule['value'] ) {
+				if( $user_role === $rule['value'] ) {
 	        	
-	        		$match = true;
+					$match = true;
 	        		
-	        	}
+				}
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 		        
 					$match = true;
 					
 				}
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	if( $user_role !== $rule['value'] ) {
+				if( $user_role !== $rule['value'] ) {
 	        	
-	        		$match = true;
+					$match = true;
 	        		
-	        	}
+				}
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 		        
 					$match = false;
 					
 				}
 				
-	        }
+			}
 	        
 		} elseif( $user_id ) {
 			
 			if( $rule['operator'] == "==" ) {
 				
-	        	if( $user_id === 'new' ) {
+				if( $user_id === 'new' ) {
 	        		
-	        		// case: add user
-		        	$match = ( $rule['value'] == get_option('default_role') );
+					// case: add user
+					$match = ( $rule['value'] == get_option('default_role') );
 		        	
-	        	} else {
+				} else {
 	        		
-	        		// case: edit user
-		        	$match = ( user_can($user_id, $rule['value']) );
+					// case: edit user
+					$match = ( user_can($user_id, $rule['value']) );
 		        	
-	        	}
+				}
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 		        	
 					$match = true;
 					
 				}
 				
-	        } elseif( $rule['operator'] == "!=" ) {
+			} elseif( $rule['operator'] == "!=" ) {
 	        	
-	        	if( $user_id === 'new' ) {
+				if( $user_id === 'new' ) {
 	        		
-	        		// case: add user
-		        	$match = ( $rule['value'] != get_option('default_role') );
+					// case: add user
+					$match = ( $rule['value'] != get_option('default_role') );
 		        	
-	        	} else {
+				} else {
 	        		
-	        		// case: edit user
-		        	$match = ( !user_can($user_id, $rule['value']) );
+					// case: edit user
+					$match = ( !user_can($user_id, $rule['value']) );
 		        	
-	        	}
+				}
 	        	
 	        	
-	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+				// override for "all"
+				if( $rule['value'] === 'all' ) {
 		        	
 					$match = false;
 					
 				}
 				
-	        }
+			}
 	        
 		}
 		
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
        
-    /*
+	/*
 	*  rule_match_taxonomy
 	*
 	*  This function will match a location rule and return true or false
@@ -989,36 +989,36 @@ 
 		// compare
 		if( $rule['operator'] == "==" ) {
 			
-        	$match = ( $taxonomy == $rule['value'] );
+			$match = ( $taxonomy == $rule['value'] );
         	
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $taxonomy != $rule['value'] );
+			$match = ( $taxonomy != $rule['value'] );
         		
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        	
 				$match = false;
 				
 			}
 			
-        }
+		}
 		
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
-    /*
+	/*
 	*  rule_match_attachment
 	*
 	*  This function will match a location rule and return true or false
@@ -1049,37 +1049,37 @@ 
 		// compare
 		if( $rule['operator'] == "==" ) {
 			
-        	$match = ( $attachment == $rule['value'] );
+			$match = ( $attachment == $rule['value'] );
         	
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $attachment != $rule['value'] );
+			$match = ( $attachment != $rule['value'] );
         		
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = false;
 				
 			}
 			
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
     
-    /*
+	/*
 	*  rule_match_comment
 	*
 	*  This function will match a location rule and return true or false
@@ -1110,36 +1110,36 @@ 
 		// compare
 		if( $rule['operator'] == "==" ) {
 			
-        	$match = ( $comment == $rule['value'] );
+			$match = ( $comment == $rule['value'] );
         	
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $comment != $rule['value'] );
+			$match = ( $comment != $rule['value'] );
         		
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = false;
 				
 			}
 			
-        }
+		}
         
         
-        // return
-        return $match;
+		// return
+		return $match;
         
-    }
+	}
     
     
-    /*
+	/*
 	*  rule_match_widget
 	*
 	*  This function will match a location rule and return true or false
@@ -1153,7 +1153,7 @@ 
 	*  @return	$options (array)
 	*/
     
-    function rule_match_widget( $match, $rule, $options ) {
+	function rule_match_widget( $match, $rule, $options ) {
 		
 		// vars
 		$widget = $options['widget'];
@@ -1170,32 +1170,32 @@ 
 		// compare
 		if( $rule['operator'] == "==" ) {
 			
-        	$match = ( $widget == $rule['value'] );
+			$match = ( $widget == $rule['value'] );
         	
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+		} elseif( $rule['operator'] == "!=" ) {
         	
-        	$match = ( $widget != $rule['value'] );
+			$match = ( $widget != $rule['value'] );
         		
-        	// override for "all"
-	        if( $rule['value'] == "all" ) {
+			// override for "all"
+			if( $rule['value'] == "all" ) {
 	        
 				$match = false;
 				
 			}
 			
-        }
+		}
         
                 
-        // return
-        return $match;
-    }
+		// return
+		return $match;
+	}
 			
 }
 

Spacing +210 added lines, -210 removed lines

@@ -18,33 +18,33 @@ 
 	function __construct() {
 		
 		// Post
-		add_filter( 'acf/location/rule_match/post_type',		array($this, 'rule_match_post_type'), 10, 3 );
-		add_filter( 'acf/location/rule_match/post',				array($this, 'rule_match_post'), 10, 3 );
-		add_filter( 'acf/location/rule_match/post_category',	array($this, 'rule_match_post_taxonomy'), 10, 3 );
-		add_filter( 'acf/location/rule_match/post_format',		array($this, 'rule_match_post_format'), 10, 3 );
-		add_filter( 'acf/location/rule_match/post_status',		array($this, 'rule_match_post_status'), 10, 3 );
-		add_filter( 'acf/location/rule_match/post_taxonomy',	array($this, 'rule_match_post_taxonomy'), 10, 3 );
+		add_filter('acf/location/rule_match/post_type', array($this, 'rule_match_post_type'), 10, 3);
+		add_filter('acf/location/rule_match/post', array($this, 'rule_match_post'), 10, 3);
+		add_filter('acf/location/rule_match/post_category', array($this, 'rule_match_post_taxonomy'), 10, 3);
+		add_filter('acf/location/rule_match/post_format', array($this, 'rule_match_post_format'), 10, 3);
+		add_filter('acf/location/rule_match/post_status', array($this, 'rule_match_post_status'), 10, 3);
+		add_filter('acf/location/rule_match/post_taxonomy', array($this, 'rule_match_post_taxonomy'), 10, 3);
 		
 		
 		// Page
-		add_filter( 'acf/location/rule_match/page',				array($this, 'rule_match_post'), 10, 3 );
-		add_filter( 'acf/location/rule_match/page_type',		array($this, 'rule_match_page_type'), 10, 3 );
-		add_filter( 'acf/location/rule_match/page_parent',		array($this, 'rule_match_page_parent'), 10, 3 );
-		add_filter( 'acf/location/rule_match/page_template',	array($this, 'rule_match_page_template'), 10, 3 );
+		add_filter('acf/location/rule_match/page', array($this, 'rule_match_post'), 10, 3);
+		add_filter('acf/location/rule_match/page_type', array($this, 'rule_match_page_type'), 10, 3);
+		add_filter('acf/location/rule_match/page_parent', array($this, 'rule_match_page_parent'), 10, 3);
+		add_filter('acf/location/rule_match/page_template', array($this, 'rule_match_page_template'), 10, 3);
 		
 		
 		// User
-		add_filter( 'acf/location/rule_match/current_user',		array($this, 'rule_match_current_user'), 10, 3 );
-		add_filter( 'acf/location/rule_match/current_user_role',	array($this, 'rule_match_current_user_role'), 10, 3 );
-		add_filter( 'acf/location/rule_match/user_form',		array($this, 'rule_match_user_form'), 10, 3 );
-		add_filter( 'acf/location/rule_match/user_role',		array($this, 'rule_match_user_role'), 10, 3 );
+		add_filter('acf/location/rule_match/current_user', array($this, 'rule_match_current_user'), 10, 3);
+		add_filter('acf/location/rule_match/current_user_role', array($this, 'rule_match_current_user_role'), 10, 3);
+		add_filter('acf/location/rule_match/user_form', array($this, 'rule_match_user_form'), 10, 3);
+		add_filter('acf/location/rule_match/user_role', array($this, 'rule_match_user_role'), 10, 3);
 		
 		
 		// Form
-		add_filter( 'acf/location/rule_match/taxonomy',			array($this, 'rule_match_taxonomy'), 10, 3 );
-		add_filter( 'acf/location/rule_match/attachment',		array($this, 'rule_match_attachment'), 10, 3 );
-		add_filter( 'acf/location/rule_match/comment',			array($this, 'rule_match_comment'), 10, 3 );
-		add_filter( 'acf/location/rule_match/widget',			array($this, 'rule_match_widget'), 10, 3 );
+		add_filter('acf/location/rule_match/taxonomy', array($this, 'rule_match_taxonomy'), 10, 3);
+		add_filter('acf/location/rule_match/attachment', array($this, 'rule_match_attachment'), 10, 3);
+		add_filter('acf/location/rule_match/comment', array($this, 'rule_match_comment'), 10, 3);
+		add_filter('acf/location/rule_match/widget', array($this, 'rule_match_widget'), 10, 3);
 		
 	}
 		
@@ -63,33 +63,33 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_post_type( $match, $rule, $options ) {
+	function rule_match_post_type($match, $rule, $options) {
 		
 		// vars
 		$post_type = $options['post_type'];
 		
 		
 		// find post type for current post
-		if( !$post_type ) {
+		if ( ! $post_type) {
 			
-			if( !$options['post_id'] ) {
+			if ( ! $options['post_id']) {
 				
 				return false;
 				
 			}
 			
-			$post_type = get_post_type( $options['post_id'] );
+			$post_type = get_post_type($options['post_id']);
 		}
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+        if ($rule['operator'] == "==") {
         	
-        	$match = ( $post_type === $rule['value'] );
+        	$match = ($post_type === $rule['value']);
         	
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $post_type !== $rule['value'] );
+        	$match = ($post_type !== $rule['value']);
         	
         }
         
@@ -113,18 +113,18 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_current_user( $match, $rule, $options ) {
+	function rule_match_current_user($match, $rule, $options) {
 		
 		// logged in
-		if( $rule['value'] == 'logged_in' ) {
+		if ($rule['value'] == 'logged_in') {
 			
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 				
 				$match = is_user_logged_in();
 					
-			} elseif( $rule['operator'] == "!=" ) {
+			} elseif ($rule['operator'] == "!=") {
 				
-				$match = !is_user_logged_in();
+				$match = ! is_user_logged_in();
 					
 			}
 			
@@ -134,13 +134,13 @@ 
 		
 		
 		// front end
-		if( $rule['value'] == 'viewing_front' ) {
+		if ($rule['value'] == 'viewing_front') {
 			
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 				
-				$match = !is_admin();
+				$match = ! is_admin();
 					
-			} elseif( $rule['operator'] == "!=" ) {
+			} elseif ($rule['operator'] == "!=") {
 				
 				$match = is_admin();
 					
@@ -152,15 +152,15 @@ 
 		
 		
 		// back end
-		if( $rule['value'] == 'viewing_back' ) {
+		if ($rule['value'] == 'viewing_back') {
 			
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 				
 				$match = is_admin();
 					
-			} elseif( $rule['operator'] == "!=" ) {
+			} elseif ($rule['operator'] == "!=") {
 				
-				$match = !is_admin();
+				$match = ! is_admin();
 					
 			}
 			
@@ -189,10 +189,10 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_current_user_role( $match, $rule, $options ) {
+	function rule_match_current_user_role($match, $rule, $options) {
 		
 		// bail early if not logged in
-		if( !is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			
 			return false;
 			
@@ -204,27 +204,27 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+        if ($rule['operator'] == "==") {
         	
-			if( $rule['value'] == 'super_admin' ) {
+			if ($rule['value'] == 'super_admin') {
 				
-				$match = is_super_admin( $user->ID );
+				$match = is_super_admin($user->ID);
 				
 			} else {
 				
-				$match = in_array( $rule['value'], $user->roles );
+				$match = in_array($rule['value'], $user->roles);
 				
 			}
 			
-		} elseif( $rule['operator'] == "!=" ) {
+		} elseif ($rule['operator'] == "!=") {
 			
-			if( $rule['value'] == 'super_admin' ) {
+			if ($rule['value'] == 'super_admin') {
 				
-				$match = !is_super_admin( $user->ID );
+				$match = ! is_super_admin($user->ID);
 				
 			} else {
 				
-				$match = ( ! in_array( $rule['value'], $user->roles ) );
+				$match = ( ! in_array($rule['value'], $user->roles));
 				
 			}
 			
@@ -251,14 +251,14 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_post( $match, $rule, $options ) {
+	function rule_match_post($match, $rule, $options) {
 		
 		// vars
 		$post_id = $options['post_id'];
 		
 		
 		// validation
-		if( !$post_id ) {
+		if ( ! $post_id) {
 		
 			return false;
 			
@@ -274,13 +274,13 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==") {
+        if ($rule['operator'] == "==") {
         	
-        	$match = ( $options['post_id'] == $rule['value'] );
+        	$match = ($options['post_id'] == $rule['value']);
         
-        } elseif( $rule['operator'] == "!=") {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $options['post_id'] != $rule['value'] );
+        	$match = ($options['post_id'] != $rule['value']);
         
         }
         
@@ -305,10 +305,10 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_post_taxonomy( $match, $rule, $options ) {
+	function rule_match_post_taxonomy($match, $rule, $options) {
 		
 		// validate
-		if( !$options['post_id'] ) {
+		if ( ! $options['post_id']) {
 		
 			return false;
 			
@@ -321,20 +321,20 @@ 
 			
 		// get term data
 		// - selected term may have a numeric slug '123' (user reported on forum), so always check slug first
-		$data = acf_decode_taxonomy_term( $rule['value'] );
-		$term = get_term_by( 'slug', $data['term'], $data['taxonomy'] );
+		$data = acf_decode_taxonomy_term($rule['value']);
+		$term = get_term_by('slug', $data['term'], $data['taxonomy']);
 		
 		
 		// attempt get term via ID (ACF4 uses ID)
-		if( !$term && is_numeric($data['term']) ) {
+		if ( ! $term && is_numeric($data['term'])) {
 			
-			$term = get_term_by( 'id', $data['term'], $data['taxonomy'] );
+			$term = get_term_by('id', $data['term'], $data['taxonomy']);
 			
 		}
 		
 		
 		// bail early if no term
-		if( !$term ) {
+		if ( ! $term) {
 			
 			return false;
 						
@@ -342,28 +342,28 @@ 
 		
 		
 		// post type
-		if( !$options['post_type'] ) {
+		if ( ! $options['post_type']) {
 		
-			$options['post_type'] = get_post_type( $options['post_id'] );
+			$options['post_type'] = get_post_type($options['post_id']);
 			
 		}
 		
 		
 		// get terms
 		// - allow an empty array (sent via JS) to avoid loading the real post's terms
-		if( !is_array($terms) ) {
+		if ( ! is_array($terms)) {
 		
-			$terms = wp_get_post_terms( $options['post_id'], $term->taxonomy, array('fields' => 'ids') );
+			$terms = wp_get_post_terms($options['post_id'], $term->taxonomy, array('fields' => 'ids'));
 			
 		}
 		
 		
 		// If no terms, this is a new post and should be treated as if it has the "Uncategorized" (1) category ticked
-		if( empty($terms) ) {
+		if (empty($terms)) {
 			
-			if( is_object_in_taxonomy($options['post_type'], 'category') ) {
+			if (is_object_in_taxonomy($options['post_type'], 'category')) {
 			
-				$terms = array( 1 );
+				$terms = array(1);
 				
 			}
 			
@@ -371,13 +371,13 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==") {
+        if ($rule['operator'] == "==") {
         	
         	$match = in_array($term->term_id, $terms);
         
-        } elseif( $rule['operator'] == "!=") {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = !in_array($term->term_id, $terms);
+        	$match = ! in_array($term->term_id, $terms);
         
         }		
             
@@ -402,17 +402,17 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_post_format( $match, $rule, $options ) {
+	function rule_match_post_format($match, $rule, $options) {
 		
 		// vars
 		$post_format = $options['post_format'];
 		
 		
 		// new post format?
-		if( !$post_format ) {	
+		if ( ! $post_format) {	
 			
 			// validate
-			if( !$options['post_id'] ) {
+			if ( ! $options['post_id']) {
 			
 				return false;
 				
@@ -420,19 +420,19 @@ 
 			
 			
 			// post type
-			if( !$options['post_type'] ) {
+			if ( ! $options['post_type']) {
 			
-				$options['post_type'] = get_post_type( $options['post_id'] );
+				$options['post_type'] = get_post_type($options['post_id']);
 				
 			}
 			
 		
 			// does post_type support 'post-format'
-			if( post_type_supports( $options['post_type'], 'post-formats' ) ) {
+			if (post_type_supports($options['post_type'], 'post-formats')) {
 				
-				$post_format = get_post_format( $options['post_id'] );
+				$post_format = get_post_format($options['post_id']);
 				
-				if( $post_format === false ) {
+				if ($post_format === false) {
 				
 					$post_format = 'standard';
 					
@@ -444,13 +444,13 @@ 
 
        	
        	// compare
-        if( $rule['operator'] == "==") {
+        if ($rule['operator'] == "==") {
         	
-        	$match = ( $post_format === $rule['value'] );
+        	$match = ($post_format === $rule['value']);
         
-        } elseif( $rule['operator'] == "!=") {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $post_format !== $rule['value'] );
+        	$match = ($post_format !== $rule['value']);
         
         }
         
@@ -475,10 +475,10 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_post_status( $match, $rule, $options ) {
+	function rule_match_post_status($match, $rule, $options) {
 		
 		// validate
-		if( !$options['post_id'] ) {
+		if ( ! $options['post_id']) {
 		
 			return false;
 			
@@ -486,11 +486,11 @@ 
 		
 					
 		// vars
-		$post_status = get_post_status( $options['post_id'] );
+		$post_status = get_post_status($options['post_id']);
 	    
 	    
 	    // auto-draft = draft
-	    if( $post_status == 'auto-draft' )  {
+	    if ($post_status == 'auto-draft') {
 	    
 		    $post_status = 'draft';
 		    
@@ -498,13 +498,13 @@ 
 	    
 	    
 	    // compare
-        if( $rule['operator'] == "==") {
+        if ($rule['operator'] == "==") {
         	
-        	$match = ( $post_status === $rule['value'] );
+        	$match = ($post_status === $rule['value']);
         
-        } elseif( $rule['operator'] == "!=") {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $post_status !== $rule['value'] );
+        	$match = ($post_status !== $rule['value']);
         
         }
         
@@ -529,10 +529,10 @@ 
 	*  @return	$options (array)
 	*/
 		
-	function rule_match_page_type( $match, $rule, $options ) {
+	function rule_match_page_type($match, $rule, $options) {
 	
 		// validation
-		if( !$options['post_id'] ) {
+		if ( ! $options['post_id']) {
 		
 			return false;
 			
@@ -540,52 +540,52 @@ 
 		
 		
 		// get post
-		$post = get_post( $options['post_id'] );
+		$post = get_post($options['post_id']);
 		
 		
 		// compare   
-        if( $rule['value'] == 'front_page') {
+        if ($rule['value'] == 'front_page') {
         	
         	// vars
 	        $front_page = (int) get_option('page_on_front');
 	        
 	        
 	         // compare
-	        if( $rule['operator'] == "==" ) {
+	        if ($rule['operator'] == "==") {
 	        	
-	        	$match = ( $front_page == $post->ID );
+	        	$match = ($front_page == $post->ID);
 	        	
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( $front_page != $post->ID );
+	        	$match = ($front_page != $post->ID);
 	        
 	        }
 	        
-        } elseif( $rule['value'] == 'posts_page') {
+        } elseif ($rule['value'] == 'posts_page') {
         	
         	// vars
 	        $posts_page = (int) get_option('page_for_posts');
 	        
 	        
 	        // compare
-	        if( $rule['operator'] == "==" ) {
+	        if ($rule['operator'] == "==") {
 	        
-	        	$match = ( $posts_page == $post->ID );
+	        	$match = ($posts_page == $post->ID);
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( $posts_page != $post->ID );
+	        	$match = ($posts_page != $post->ID);
 	        	
 	        }
 	        
-        } elseif( $rule['value'] == 'top_level') {
+        } elseif ($rule['value'] == 'top_level') {
         	
         	// vars
         	$post_parent = $post->post_parent;
         	
         	
         	// override
-        	if( $options['page_parent'] ) {
+        	if ($options['page_parent']) {
 	        	
 	        	$post_parent = $options['page_parent'];
 	        	
@@ -593,17 +593,17 @@ 
         	
         	
         	// compare
-	        if( $rule['operator'] == "==" ) {
+	        if ($rule['operator'] == "==") {
 	        
-	        	$match = ( $post_parent == 0 );
+	        	$match = ($post_parent == 0);
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( $post_parent != 0 );
+	        	$match = ($post_parent != 0);
 	        	
 	        }
 	            
-        } elseif( $rule['value'] == 'parent' ) {
+        } elseif ($rule['value'] == 'parent') {
         	
         	// get children
         	$children = get_pages(array(
@@ -613,24 +613,24 @@ 
         	
 	        
 	        // compare
-	        if( $rule['operator'] == "==" ) {
+	        if ($rule['operator'] == "==") {
 	        
-	        	$match = ( count($children) > 0 );
+	        	$match = (count($children) > 0);
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( count($children) == 0 );
+	        	$match = (count($children) == 0);
 	        	
 	        }
 	        
-        } elseif( $rule['value'] == 'child') {
+        } elseif ($rule['value'] == 'child') {
         	
         	// vars
         	$post_parent = $post->post_parent;
         	
         	
         	// override
-        	if( $options['page_parent'] ) {
+        	if ($options['page_parent']) {
         	
 	        	$post_parent = $options['page_parent'];
 	        	
@@ -638,13 +638,13 @@ 
 	        
 	        
 	        // compare
-	        if( $rule['operator'] == "==" ) {
+	        if ($rule['operator'] == "==") {
 	        
-	        	$match = ( $post_parent != 0 );
+	        	$match = ($post_parent != 0);
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( $post_parent == 0 );
+	        	$match = ($post_parent == 0);
 	        	
 	        }
 	        
@@ -671,10 +671,10 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_page_parent( $match, $rule, $options ) {
+	function rule_match_page_parent($match, $rule, $options) {
 		
 		// validation
-		if( !$options['post_id'] ) {
+		if ( ! $options['post_id']) {
 		
 			return false;
 			
@@ -682,12 +682,12 @@ 
 		
 		
 		// vars
-		$post = get_post( $options['post_id'] );
+		$post = get_post($options['post_id']);
 		
 		
 		// post parent
 		$post_parent = $post->post_parent;
-    	if( $options['page_parent'] ) {
+    	if ($options['page_parent']) {
     	
         	$post_parent = $options['page_parent'];
         	
@@ -695,13 +695,13 @@ 
         
         
         // compare
-        if( $rule['operator'] == "==" ) {
+        if ($rule['operator'] == "==") {
         
-        	$match = ( $post_parent == $rule['value'] );
+        	$match = ($post_parent == $rule['value']);
         
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $post_parent != $rule['value'] );
+        	$match = ($post_parent != $rule['value']);
         	
         }
         
@@ -726,32 +726,32 @@ 
 	*  @return	$options (array)
 	*/
 		
-	function rule_match_page_template( $match, $rule, $options ) {
+	function rule_match_page_template($match, $rule, $options) {
 		
 		// vars
 		$page_template = $options['page_template'];
 		
 		
 		// get page template
-		if( !$page_template && $options['post_id'] ) {
+		if ( ! $page_template && $options['post_id']) {
 		
-			$page_template = get_post_meta( $options['post_id'], '_wp_page_template', true );
+			$page_template = get_post_meta($options['post_id'], '_wp_page_template', true);
 			
 		}
 		
 		
 		// get page template again
-		if( ! $page_template ) {
+		if ( ! $page_template) {
 			
 			$post_type = $options['post_type'];
 
-			if( !$post_type && $options['post_id'] ) {
+			if ( ! $post_type && $options['post_id']) {
 			
-				$post_type = get_post_type( $options['post_id'] );
+				$post_type = get_post_type($options['post_id']);
 				
 			}
 			
-			if( $post_type === 'page' ) {
+			if ($post_type === 'page') {
 			
 				$page_template = "default";
 				
@@ -760,13 +760,13 @@ 
 		
 		
 		// compare
-        if( $rule['operator'] == "==" ) {
+        if ($rule['operator'] == "==") {
         
-        	$match = ( $page_template === $rule['value'] );
+        	$match = ($page_template === $rule['value']);
         
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $page_template !== $rule['value'] );
+        	$match = ($page_template !== $rule['value']);
         	
         }
         
@@ -791,14 +791,14 @@ 
 	*  @return	$options (array)
 	*/
     
-    function rule_match_user_form( $match, $rule, $options ) {
+    function rule_match_user_form($match, $rule, $options) {
 		
 		// vars
 		$user_form = $options['user_form'];
 		
 		
 		// add is treated the same as edit
-		if( $user_form === 'add' ) {
+		if ($user_form === 'add') {
 		
 			$user_form = 'edit';
 			
@@ -806,27 +806,27 @@ 
 		
 		
 		// compare
-		if( $user_form ) {
+		if ($user_form) {
 		
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 				
-	        	$match = ( $user_form == $rule['value'] );
+	        	$match = ($user_form == $rule['value']);
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 					
 					$match = true;
 				
 				}
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	$match = ( $user_form != $rule['value'] );
+	        	$match = ($user_form != $rule['value']);
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 		        
 					$match = false;
 					
@@ -856,7 +856,7 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_user_role( $match, $rule, $options ) {
+	function rule_match_user_role($match, $rule, $options) {
 		
 		// vars
 		$user_id = $options['user_id'];
@@ -864,11 +864,11 @@ 
 		
 		
 		// user form AJAX will send through user_form
-		if( $user_role ) {
+		if ($user_role) {
 		
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 			
-	        	if( $user_role === $rule['value'] ) {
+	        	if ($user_role === $rule['value']) {
 	        	
 	        		$match = true;
 	        		
@@ -876,15 +876,15 @@ 
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 		        
 					$match = true;
 					
 				}
 	        
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	if( $user_role !== $rule['value'] ) {
+	        	if ($user_role !== $rule['value']) {
 	        	
 	        		$match = true;
 	        		
@@ -892,7 +892,7 @@ 
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 		        
 					$match = false;
 					
@@ -900,47 +900,47 @@ 
 				
 	        }
 	        
-		} elseif( $user_id ) {
+		} elseif ($user_id) {
 			
-			if( $rule['operator'] == "==" ) {
+			if ($rule['operator'] == "==") {
 				
-	        	if( $user_id === 'new' ) {
+	        	if ($user_id === 'new') {
 	        		
 	        		// case: add user
-		        	$match = ( $rule['value'] == get_option('default_role') );
+		        	$match = ($rule['value'] == get_option('default_role'));
 		        	
 	        	} else {
 	        		
 	        		// case: edit user
-		        	$match = ( user_can($user_id, $rule['value']) );
+		        	$match = (user_can($user_id, $rule['value']));
 		        	
 	        	}
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 		        	
 					$match = true;
 					
 				}
 				
-	        } elseif( $rule['operator'] == "!=" ) {
+	        } elseif ($rule['operator'] == "!=") {
 	        	
-	        	if( $user_id === 'new' ) {
+	        	if ($user_id === 'new') {
 	        		
 	        		// case: add user
-		        	$match = ( $rule['value'] != get_option('default_role') );
+		        	$match = ($rule['value'] != get_option('default_role'));
 		        	
 	        	} else {
 	        		
 	        		// case: edit user
-		        	$match = ( !user_can($user_id, $rule['value']) );
+		        	$match = ( ! user_can($user_id, $rule['value']));
 		        	
 	        	}
 	        	
 	        	
 	        	// override for "all"
-		        if( $rule['value'] === 'all' ) {
+		        if ($rule['value'] === 'all') {
 		        	
 					$match = false;
 					
@@ -972,14 +972,14 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_taxonomy( $match, $rule, $options ) {
+	function rule_match_taxonomy($match, $rule, $options) {
 		
 		// vars
 		$taxonomy = $options['taxonomy'];
 		
 		
 		// validate
-		if( !$taxonomy ) {
+		if ( ! $taxonomy) {
 			
 			return false;
 			
@@ -987,23 +987,23 @@ 
 		
 		
 		// compare
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 			
-        	$match = ( $taxonomy == $rule['value'] );
+        	$match = ($taxonomy == $rule['value']);
         	
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $taxonomy != $rule['value'] );
+        	$match = ($taxonomy != $rule['value']);
         		
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        	
 				$match = false;
 				
@@ -1032,14 +1032,14 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_attachment( $match, $rule, $options ) {
+	function rule_match_attachment($match, $rule, $options) {
 		
 		// vars
 		$attachment = $options['attachment'];
 		
 		
 		// validate
-		if( ! $attachment ) {
+		if ( ! $attachment) {
 			
 			return false;
 			
@@ -1047,23 +1047,23 @@ 
 		
 		
 		// compare
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 			
-        	$match = ( $attachment == $rule['value'] );
+        	$match = ($attachment == $rule['value']);
         	
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $attachment != $rule['value'] );
+        	$match = ($attachment != $rule['value']);
         		
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = false;
 				
@@ -1093,14 +1093,14 @@ 
 	*  @return	$options (array)
 	*/
 	
-	function rule_match_comment( $match, $rule, $options ) {
+	function rule_match_comment($match, $rule, $options) {
 		
 		// vars
 		$comment = $options['comment'];
 		
 		
 		// validate
-		if( ! $comment ) {
+		if ( ! $comment) {
 			
 			return false;
 			
@@ -1108,23 +1108,23 @@ 
 		
 		
 		// compare
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 			
-        	$match = ( $comment == $rule['value'] );
+        	$match = ($comment == $rule['value']);
         	
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $comment != $rule['value'] );
+        	$match = ($comment != $rule['value']);
         		
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = false;
 				
@@ -1153,14 +1153,14 @@ 
 	*  @return	$options (array)
 	*/
     
-    function rule_match_widget( $match, $rule, $options ) {
+    function rule_match_widget($match, $rule, $options) {
 		
 		// vars
 		$widget = $options['widget'];
 		
 		
 		// validate
-		if( ! $widget ) {
+		if ( ! $widget) {
 			
 			return false;
 			
@@ -1168,23 +1168,23 @@ 
 		
 		
 		// compare
-		if( $rule['operator'] == "==" ) {
+		if ($rule['operator'] == "==") {
 			
-        	$match = ( $widget == $rule['value'] );
+        	$match = ($widget == $rule['value']);
         	
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = true;
 				
 			}
 			
-        } elseif( $rule['operator'] == "!=" ) {
+        } elseif ($rule['operator'] == "!=") {
         	
-        	$match = ( $widget != $rule['value'] );
+        	$match = ($widget != $rule['value']);
         		
         	// override for "all"
-	        if( $rule['value'] == "all" ) {
+	        if ($rule['value'] == "all") {
 	        
 				$match = false;
 				
@@ -1217,7 +1217,7 @@ 
 *  @return	(boolean)
 */
 
-function acf_get_field_group_visibility( $field_group, $args = array() ) {
+function acf_get_field_group_visibility($field_group, $args = array()) {
 	
 	// vars
 	$args = acf_parse_args($args, array(
@@ -1241,7 +1241,7 @@ 
 	
 	
 	// bail early if not active
-	if( !$field_group['active'] ) {
+	if ( ! $field_group['active']) {
 		
 		return false;
 		
@@ -1249,7 +1249,7 @@ 
 	
 	
 	// WPML
-	if( defined('ICL_LANGUAGE_CODE') ) {
+	if (defined('ICL_LANGUAGE_CODE')) {
 		
 		$args['lang'] = ICL_LANGUAGE_CODE;
 		
@@ -1261,20 +1261,20 @@ 
 	
 	
 	// loop through location rules
-	foreach( $field_group['location'] as $group_id => $group ) {
+	foreach ($field_group['location'] as $group_id => $group) {
 		
 		// start of as true, this way, any rule that doesn't match will cause this varaible to false
 		$match_group = true;
 		
 		
 		// loop over group rules
-		if( !empty($group) ) {
+		if ( ! empty($group)) {
 		
-			foreach( $group as $rule_id => $rule ) {
+			foreach ($group as $rule_id => $rule) {
 				
-				$match = apply_filters( 'acf/location/rule_match/' . $rule['param'] , false, $rule, $args );
+				$match = apply_filters('acf/location/rule_match/'.$rule['param'], false, $rule, $args);
 				
-				if( !$match ) {
+				if ( ! $match) {
 					
 					$match_group = false;
 					break;
@@ -1287,7 +1287,7 @@ 
 		
 		
 		// all rules must havematched!
-		if( $match_group ) {
+		if ($match_group) {
 			
 			$visibility = true;
 			

includes/acf/core/media.php

Spacing +23 added lines, -23 removed lines

@@ -19,16 +19,16 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('acf/save_post', 				array($this, 'save_files'), 5, 1);
-		add_action('acf/input/admin_footer_js', 	array($this, 'admin_footer_js'));
+		add_action('acf/save_post', array($this, 'save_files'), 5, 1);
+		add_action('acf/input/admin_footer_js', array($this, 'admin_footer_js'));
 		
 		
 		// filters
-		add_filter('wp_handle_upload_prefilter', 	array($this, 'handle_upload_prefilter'), 10, 1);
+		add_filter('wp_handle_upload_prefilter', array($this, 'handle_upload_prefilter'), 10, 1);
 		
 		
 		// ajax
-		add_action( 'wp_ajax_query-attachments',	array($this, 'wp_ajax_query_attachments'), -1);
+		add_action('wp_ajax_query-attachments', array($this, 'wp_ajax_query_attachments'), -1);
 		
 	}
 	
@@ -46,10 +46,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function handle_upload_prefilter( $file ) {
+	function handle_upload_prefilter($file) {
 		
 		// bail early if no acf field
-		if( empty($_POST['_acfuploader']) ) {
+		if (empty($_POST['_acfuploader'])) {
 		
 			return $file;
 			
@@ -57,9 +57,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $_POST['_acfuploader'] );
+		$field = acf_get_field($_POST['_acfuploader']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return $file;
 			
@@ -67,18 +67,18 @@ 
 		
 		
 		// get errors
-		$errors = acf_validate_attachment( $file, $field, 'upload' );
+		$errors = acf_validate_attachment($file, $field, 'upload');
 		
 		
 		// filter for 3rd party customization
 		$errors = apply_filters("acf/upload_prefilter", $errors, $file, $field);
-		$errors = apply_filters("acf/upload_prefilter/type={$field['type']}", $errors, $file, $field );
-		$errors = apply_filters("acf/upload_prefilter/name={$field['name']}", $errors, $file, $field );
-		$errors = apply_filters("acf/upload_prefilter/key={$field['key']}", $errors, $file, $field );
+		$errors = apply_filters("acf/upload_prefilter/type={$field['type']}", $errors, $file, $field);
+		$errors = apply_filters("acf/upload_prefilter/name={$field['name']}", $errors, $file, $field);
+		$errors = apply_filters("acf/upload_prefilter/key={$field['key']}", $errors, $file, $field);
 		
 		
 		// append error
-		if( !empty($errors) ) {
+		if ( ! empty($errors)) {
 			
 			$file['error'] = implode("\n", $errors);
 			
@@ -104,10 +104,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_files( $post_id = 0 ) {
+	function save_files($post_id = 0) {
 		
 		// bail early if no $_FILES data
-		if( empty($_FILES['acf']['name']) ) {
+		if (empty($_FILES['acf']['name'])) {
 			
 			return;
 			
@@ -135,7 +135,7 @@ 
 	
 	function admin_footer_js() {
 		
-		?>acf.media.mime_types = <?php echo json_encode( get_allowed_mime_types() ); ?>;
+		?>acf.media.mime_types = <?php echo json_encode(get_allowed_mime_types()); ?>;
 	<?php
 		
 	}
@@ -156,18 +156,18 @@ 
 	
 	function wp_ajax_query_attachments() {
 		
-		add_filter('wp_prepare_attachment_for_js', 	array($this, 'wp_prepare_attachment_for_js'), 10, 3);
+		add_filter('wp_prepare_attachment_for_js', array($this, 'wp_prepare_attachment_for_js'), 10, 3);
 		
 	}
 	
-	function wp_prepare_attachment_for_js( $response, $attachment, $meta ) {
+	function wp_prepare_attachment_for_js($response, $attachment, $meta) {
 		
 		// append attribute
 		$response['acf_errors'] = false;
 		
 		
 		// bail early if no acf field
-		if( empty($_POST['query']['_acfuploader']) ) {
+		if (empty($_POST['query']['_acfuploader'])) {
 		
 			return $response;
 			
@@ -175,9 +175,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $_POST['query']['_acfuploader'] );
+		$field = acf_get_field($_POST['query']['_acfuploader']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return $response;
 			
@@ -185,11 +185,11 @@ 
 		
 		
 		// get errors
-		$errors = acf_validate_attachment( $response, $field, 'prepare' );
+		$errors = acf_validate_attachment($response, $field, 'prepare');
 		
 		
 		// append errors
-		if( !empty($errors) ) {
+		if ( ! empty($errors)) {
 			
 			$response['acf_errors'] = implode('<br />', $errors);
 			

includes/acf/core/revisions.php

Spacing +38 added lines, -38 removed lines

@@ -17,12 +17,12 @@ 
 	function __construct()
 	{
 		// actions		
-		add_action('wp_restore_post_revision', array($this, 'wp_restore_post_revision'), 10, 2 );
+		add_action('wp_restore_post_revision', array($this, 'wp_restore_post_revision'), 10, 2);
 		
 		
 		// filters
-		add_filter('_wp_post_revision_fields', array($this, 'wp_preview_post_fields') );
-		add_filter('_wp_post_revision_fields', array($this, 'wp_post_revision_fields') );
+		add_filter('_wp_post_revision_fields', array($this, 'wp_preview_post_fields'));
+		add_filter('_wp_post_revision_fields', array($this, 'wp_post_revision_fields'));
 		add_filter('wp_save_post_revision_check_for_changes', array($this, 'force_save_revision'), 10, 3);
 	}
 	
@@ -42,10 +42,10 @@ 
 	*  @return	$fields
 	*/
 	
-	function wp_preview_post_fields( $fields ) {
+	function wp_preview_post_fields($fields) {
 		
 		// bail early if not previewing a post
-		if( empty($_POST['wp-preview']) || $_POST['wp-preview'] != 'dopreview') {
+		if (empty($_POST['wp-preview']) || $_POST['wp-preview'] != 'dopreview') {
 			
 			return $fields;
 			
@@ -53,7 +53,7 @@ 
 		
 		
 		// add to fields if ACF has changed
-		if( !empty($_POST['_acfchanged']) ) {
+		if ( ! empty($_POST['_acfchanged'])) {
 			
 			$fields['_acfchanged'] = 'different than 1';
 			
@@ -81,10 +81,10 @@ 
 	*  @return	$return (boolean)
 	*/
 	
-	function force_save_revision( $return, $last_revision, $post )
+	function force_save_revision($return, $last_revision, $post)
 	{
 		// preview hack
-		if( isset($_POST['_acfchanged']) && $_POST['_acfchanged'] == '1' )
+		if (isset($_POST['_acfchanged']) && $_POST['_acfchanged'] == '1')
 		{
 			$return = false;
 		}
@@ -109,7 +109,7 @@ 
 	*  @return	$post_id (int)
 	*/
 		
-	function wp_post_revision_fields( $return ) {
+	function wp_post_revision_fields($return) {
 		
 		
 		//globals
@@ -121,21 +121,21 @@ 
 		
 		
 		// Normal revisions page
-		if( $pagenow == 'revision.php' )
+		if ($pagenow == 'revision.php')
 		{
 			$allowed = true;
 		}
 		
 		
 		// WP 3.6 AJAX revision
-		if( $pagenow == 'admin-ajax.php' && isset($_POST['action']) && $_POST['action'] == 'get-revision-diffs' )
+		if ($pagenow == 'admin-ajax.php' && isset($_POST['action']) && $_POST['action'] == 'get-revision-diffs')
 		{
 			$allowed = true;
 		}
 		
 		
 		// bail
-		if( !$allowed ) 
+		if ( ! $allowed) 
 		{
 			return $return;
 		}
@@ -146,11 +146,11 @@ 
 		
 		
 		// determine $post_id
-		if( isset($_POST['post_id']) )
+		if (isset($_POST['post_id']))
 		{
 			$post_id = $_POST['post_id'];
 		}
-		elseif( isset($post->ID) )
+		elseif (isset($post->ID))
 		{
 			$post_id = $post->ID;
 		}
@@ -165,20 +165,20 @@ 
 		
 		
 		// get field objects
-		$custom_fields = get_post_custom( $post_id );
+		$custom_fields = get_post_custom($post_id);
 		
 		
 		// populate vars
-		if( !empty($custom_fields) )
+		if ( ! empty($custom_fields))
 		{
-			foreach( $custom_fields as $k => $v )
+			foreach ($custom_fields as $k => $v)
 			{
 				// value is always an array
 				$v = $v[0];
 				
 				
 				// bail early if $value is not is a field_key
-				if( !acf_is_field_key($v) )
+				if ( ! acf_is_field_key($v))
 				{
 					continue;
 				}
@@ -193,7 +193,7 @@ 
 				
 				
 				// append to return
-				$return[ $field_name ] = $field_name;
+				$return[$field_name] = $field_name;
 				
 				
 				// load value
@@ -202,12 +202,12 @@ 
 				
 				// WP 3.5: left vs right
 				// Add a value of the revision ID (as there is no way to determine this within the '_wp_post_revision_field_' filter!)
-				if( isset($_GET['action'], $_GET['left'], $_GET['right']) && $_GET['action'] == 'diff' )
+				if (isset($_GET['action'], $_GET['left'], $_GET['right']) && $_GET['action'] == 'diff')
 				{
 					global $left_revision, $right_revision;
 					
-					$left_revision->$field_name = 'revision_id=' . $_GET['left'];
-					$right_revision->$field_name = 'revision_id=' . $_GET['right'];
+					$left_revision->$field_name = 'revision_id='.$_GET['left'];
+					$right_revision->$field_name = 'revision_id='.$_GET['right'];
 				}
 				
 			}
@@ -234,24 +234,24 @@ 
 	*  @return	$value (string)
 	*/
 	
-	function wp_post_revision_field( $value, $field_name, $post = null, $direction = false)
+	function wp_post_revision_field($value, $field_name, $post = null, $direction = false)
 	{
 		// vars
 		$post_id = 0;
 		
 		
 		// determine $post_id
-		if( isset($post->ID) )
+		if (isset($post->ID))
 		{
 			// WP 3.6
 			$post_id = $post->ID;
 		}
-		elseif( isset($_GET['revision']) )
+		elseif (isset($_GET['revision']))
 		{
 			// WP 3.5
 			$post_id = (int) $_GET['revision'];
 		}
-		elseif( strpos($value, 'revision_id=') !== false )
+		elseif (strpos($value, 'revision_id=') !== false)
 		{
 			// WP 3.5 (left vs right)
 			$post_id = (int) str_replace('revision_id=', '', $value);
@@ -259,7 +259,7 @@ 
 		
 		
 		// load field
-		$field = acf_maybe_get_field( $field_name, $post_id );
+		$field = acf_maybe_get_field($field_name, $post_id);
 		
 		
 		// update value
@@ -267,7 +267,7 @@ 
 		
 		
 		// default formatting
-		if( is_array($value) ) {
+		if (is_array($value)) {
 			
 			$value = implode(', ', $value);
 			
@@ -275,13 +275,13 @@ 
 		
 		
 		// format
-		if( !empty($value) )
+		if ( ! empty($value))
 		{
 			// image || file?
-			if( $field['type'] == 'image' || $field['type'] == 'file' )
+			if ($field['type'] == 'image' || $field['type'] == 'file')
 			{
 				$url = wp_get_attachment_url($value);
-				$value = $value . ' (' . $url . ')';
+				$value = $value.' ('.$url.')';
 			}
 		}
 		
@@ -303,27 +303,27 @@ 
 	*  @return	$revision_id (int) the source post
 	*/
 	
-	function wp_restore_post_revision( $post_id, $revision_id ) {
+	function wp_restore_post_revision($post_id, $revision_id) {
 	
 		// global
 		global $wpdb;
 		
 		
 		// get field objects
-		$custom_fields = get_post_custom( $revision_id );
+		$custom_fields = get_post_custom($revision_id);
 		
 		
 		// populate vars
-		if( !empty($custom_fields) )
+		if ( ! empty($custom_fields))
 		{
-			foreach( $custom_fields as $k => $v )
+			foreach ($custom_fields as $k => $v)
 			{
 				// value is always an array
 				$v = $v[0];
 				
 				
 				// bail early if $value is not is a field_key
-				if( !acf_is_field_key($v) )
+				if ( ! acf_is_field_key($v))
 				{
 					continue;
 				}
@@ -334,13 +334,13 @@ 
 				
 				
 				// bail early if value could not be found
-				if( !isset($custom_fields[ $field_name ][0]) )
+				if ( ! isset($custom_fields[$field_name][0]))
 				{
 					continue;
 				}
 				
 				
-				update_post_meta( $post_id, $field_name, $custom_fields[ $field_name ][0] );
+				update_post_meta($post_id, $field_name, $custom_fields[$field_name][0]);
 				
 				
 			}

Braces +4 added lines, -8 removed lines

@@ -149,12 +149,10 @@ 
 		if( isset($_POST['post_id']) )
 		{
 			$post_id = $_POST['post_id'];
-		}
-		elseif( isset($post->ID) )
+		} elseif( isset($post->ID) )
 		{
 			$post_id = $post->ID;
-		}
-		else
+		} else
 		{
 			return $return;
 		}
@@ -245,13 +243,11 @@ 
 		{
 			// WP 3.6
 			$post_id = $post->ID;
-		}
-		elseif( isset($_GET['revision']) )
+		} elseif( isset($_GET['revision']) )
 		{
 			// WP 3.5
 			$post_id = (int) $_GET['revision'];
-		}
-		elseif( strpos($value, 'revision_id=') !== false )
+		} elseif( strpos($value, 'revision_id=') !== false )
 		{
 			// WP 3.5 (left vs right)
 			$post_id = (int) str_replace('revision_id=', '', $value);