rousnay / lighthouse

includes/acf/admin/views/settings-tools-export.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php 
 
 // vars
-$field_groups = acf_extract_var( $args, 'field_groups');
+$field_groups = acf_extract_var($args, 'field_groups');
 
 
 // replace
@@ -32,28 +32,28 @@ 
 			
 			<textarea class="pre" readonly="true"><?php
 			
-			echo "if( function_exists('acf_add_local_field_group') ):" . "\r\n" . "\r\n";
+			echo "if( function_exists('acf_add_local_field_group') ):"."\r\n"."\r\n";
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 						
 				// code
 				$code = var_export($field_group, true);
 				
 				
 				// change double spaces to tabs
-				$code = str_replace( array_keys($str_replace), array_values($str_replace), $code );
+				$code = str_replace(array_keys($str_replace), array_values($str_replace), $code);
 				
 				
 				// correctly formats "=> array("
-				$code = preg_replace( array_keys($preg_replace), array_values($preg_replace), $code );
+				$code = preg_replace(array_keys($preg_replace), array_values($preg_replace), $code);
 				
 				
 				// esc_textarea
-				$code = esc_textarea( $code );
+				$code = esc_textarea($code);
 				
 				
 				// echo
-				echo "acf_add_local_field_group({$code});" . "\r\n" . "\r\n";
+				echo "acf_add_local_field_group({$code});"."\r\n"."\r\n";
 			
 			}
 			

includes/acf/admin/views/settings-tools.php

Spacing +6 added lines, -6 removed lines

@@ -15,11 +15,11 @@ 
 
 
 // populate choices
-if( $field_groups ) {
+if ($field_groups) {
 	
-	foreach( $field_groups as $field_group ) {
+	foreach ($field_groups as $field_group) {
 		
-		$field['choices'][ $field_group['key'] ] = $field_group['title'];
+		$field['choices'][$field_group['key']] = $field_group['title'];
 		
 	}
 	
@@ -39,11 +39,11 @@ 
 			
 			<form method="post" action="">
 			<div class="acf-hidden">
-				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( 'export' ); ?>" />
+				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce('export'); ?>" />
 			</div>
 			<table class="form-table">
                 <tbody>
-	                <?php acf_render_field_wrap( $field, 'tr' ); ?>
+	                <?php acf_render_field_wrap($field, 'tr'); ?>
 					<tr>
 						<th></th>
 						<td>
@@ -68,7 +68,7 @@ 
 			
 			<form method="post" action="" enctype="multipart/form-data">
 			<div class="acf-hidden">
-				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( 'import' ); ?>" />
+				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce('import'); ?>" />
 			</div>
 			<table class="form-table">
                 <tbody>

includes/acf/admin/views/update-network.php

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
 ?>
 <div id="acf-upgrade-wrap" class="wrap">
 	
-	<h1><?php _e("Advanced Custom Fields Database Upgrade",'acf'); ?></h1>
+	<h1><?php _e("Advanced Custom Fields Database Upgrade", 'acf'); ?></h1>
 	
-	<p><?php _e("The following sites require a DB upgrade. Check the ones you want to update and then click “Upgrade Database”.",'acf'); ?></p>
+	<p><?php _e("The following sites require a DB upgrade. Check the ones you want to update and then click “Upgrade Database”.", 'acf'); ?></p>
 	
 	<p><input type="submit" name="upgrade" value="Update Sites" class="button" id="upgrade-sites"></p>
 	
@@ -31,11 +31,11 @@ 
 		
 		<tbody id="the-list">
 		
-		<?php foreach( $sites as $i => $site ): ?>
+		<?php foreach ($sites as $i => $site): ?>
 			
-			<tr<?php if( $i % 2 == 0 ): ?> class="alternate"<?php endif; ?>>
+			<tr<?php if ($i % 2 == 0): ?> class="alternate"<?php endif; ?>>
 				<th class="check-column" scope="row">
-				<?php if( $site['updates'] ): ?>
+				<?php if ($site['updates']): ?>
 					<input type="checkbox" value="<?php echo $site['blog_id']; ?>" name="checked[]">
 				<?php endif; ?>
 				</th>
@@ -43,7 +43,7 @@ 
 					<strong><?php echo $site['name']; ?></strong><br /><?php echo $site['url']; ?>
 				</td>
 				<td>
-				<?php if( $site['updates'] ): ?>
+				<?php if ($site['updates']): ?>
 					<span class="response"><?php printf(__('Site requires database upgrade from %s to %s', 'acf'), $site['acf_version'], $plugin_version); ?></span>
 				<?php else: ?>
 					<?php _e("Site is up to date", 'acf'); ?>
@@ -59,7 +59,7 @@ 
 	
 	<p><input type="submit" name="upgrade" value="Update Sites" class="button" id="upgrade-sites-2"></p>
 	
-	<p class="show-on-complete"><?php _e('Database Upgrade complete', 'acf'); ?>. <a href="<?php echo network_admin_url(); ?>"><?php _e("Return to network dashboard",'acf'); ?></a>.</p>
+	<p class="show-on-complete"><?php _e('Database Upgrade complete', 'acf'); ?>. <a href="<?php echo network_admin_url(); ?>"><?php _e("Return to network dashboard", 'acf'); ?></a>.</p>
 	
 	<style type="text/css">
 		

Braces +5 added lines, -2 removed lines

@@ -45,8 +45,11 @@
 				<td>
 				<?php if( $site['updates'] ): ?>
 					<span class="response"><?php printf(__('Site requires database upgrade from %s to %s', 'acf'), $site['acf_version'], $plugin_version); ?></span>
-				<?php else: ?>
-					<?php _e("Site is up to date", 'acf'); ?>
+				<?php else {
+	: ?>
+					<?php _e("Site is up to date", 'acf');
+}
+?>
 				<?php endif; ?>
 				</td>
 			</tr>

includes/acf/admin/views/update-notice.php

Spacing +4 added lines, -4 removed lines

@@ -20,19 +20,19 @@
 		
 		<div class="content">
 			
-			<h2><?php _e("Database Upgrade Required",'acf'); ?></h2>
+			<h2><?php _e("Database Upgrade Required", 'acf'); ?></h2>
 			
-			<p><?php printf(__("Thank you for updating to %s v%s!", 'acf'), acf_get_setting('name'), acf_get_setting('version') ); ?><br /><?php _e("Before you start using the new awesome features, please update your database to the newest version.", 'acf'); ?></p>
+			<p><?php printf(__("Thank you for updating to %s v%s!", 'acf'), acf_get_setting('name'), acf_get_setting('version')); ?><br /><?php _e("Before you start using the new awesome features, please update your database to the newest version.", 'acf'); ?></p>
 			
 			<p><a id="acf-notice-action" href="<?php echo $button_url; ?>" class="acf-button blue"><?php echo $button_text; ?></a></p>
 			
-		<?php if( $confirm ): ?>
+		<?php if ($confirm): ?>
 			<script type="text/javascript">
 			(function($) {
 				
 				$("#acf-notice-action").on("click", function(){
 			
-					var answer = confirm("<?php _e( 'It is strongly recommended that you backup your database before proceeding. Are you sure you wish to run the updater now?', 'acf' ); ?>");
+					var answer = confirm("<?php _e('It is strongly recommended that you backup your database before proceeding. Are you sure you wish to run the updater now?', 'acf'); ?>");
 					return answer;
 			
 				});

includes/acf/admin/views/update.php

Spacing +3 added lines, -3 removed lines

@@ -5,15 +5,15 @@
 ?>
 <div id="acf-upgrade-wrap" class="wrap">
 	
-	<h1><?php _e("Advanced Custom Fields Database Upgrade",'acf'); ?></h1>
+	<h1><?php _e("Advanced Custom Fields Database Upgrade", 'acf'); ?></h1>
 	
-<?php if( !empty($updates) ): ?>
+<?php if ( ! empty($updates)): ?>
 	
 	<p><?php _e('Reading upgrade tasks...', 'acf'); ?></p>
 	
 	<p class="show-on-ajax"><i class="acf-loading"></i> <?php printf(__('Upgrading data to version %s', 'acf'), $plugin_version); ?></p>
 	
-	<p class="show-on-complete"><?php _e('Database Upgrade complete', 'acf'); ?>. <a href="<?php echo admin_url('edit.php?post_type=acf-field-group&page=acf-settings-info'); ?>"><?php _e("See what's new",'acf'); ?></a>.</p>
+	<p class="show-on-complete"><?php _e('Database Upgrade complete', 'acf'); ?>. <a href="<?php echo admin_url('edit.php?post_type=acf-field-group&page=acf-settings-info'); ?>"><?php _e("See what's new", 'acf'); ?></a>.</p>
 
 	<style type="text/css">
 		

Braces +5 added lines, -2 removed lines

@@ -105,9 +105,12 @@
 	})(jQuery);	
 	</script>
 	
-<?php else: ?>
+<?php else {
+	: ?>
 
-	<p><?php _e('No updates available', 'acf'); ?>.</p>
+	<p><?php _e('No updates available', 'acf');
+}
+?>.</p>
 	
 <?php endif; ?>
 

includes/acf/api/api-field-group.php

Indentation +21 added lines, -21 removed lines

@@ -475,36 +475,36 @@ 
 	
 	// vars
 	$data = maybe_serialize( $data );
-    $post_status = $extract['active'] ? 'publish' : 'acf-disabled';
+	$post_status = $extract['active'] ? 'publish' : 'acf-disabled';
     
     
-    // save
-    $save = array(
-    	'ID'			=> $extract['ID'],
-    	'post_status'	=> $post_status,
-    	'post_type'		=> 'acf-field-group',
-    	'post_title'	=> $extract['title'],
-    	'post_name'		=> $extract['key'],
-    	'post_excerpt'	=> sanitize_title($extract['title']),
-    	'post_content'	=> $data,
-    	'menu_order'	=> $extract['menu_order'],
-    );
+	// save
+	$save = array(
+		'ID'			=> $extract['ID'],
+		'post_status'	=> $post_status,
+		'post_type'		=> 'acf-field-group',
+		'post_title'	=> $extract['title'],
+		'post_name'		=> $extract['key'],
+		'post_excerpt'	=> sanitize_title($extract['title']),
+		'post_content'	=> $data,
+		'menu_order'	=> $extract['menu_order'],
+	);
     
     
-    // allow field groups to contain the same name
+	// allow field groups to contain the same name
 	add_filter( 'wp_unique_post_slug', 'acf_update_field_group_wp_unique_post_slug', 100, 6 ); 
 	
     
-    // update the field group and update the ID
-    if( $field_group['ID'] ) {
+	// update the field group and update the ID
+	if( $field_group['ID'] ) {
 	    
-	    wp_update_post( $save );
+		wp_update_post( $save );
 	    
-    } else {
+	} else {
 	    
-	    $field_group['ID'] = wp_insert_post( $save );
+		$field_group['ID'] = wp_insert_post( $save );
 	    
-    }
+	}
 	
 	
 	// action for 3rd party customization
@@ -517,8 +517,8 @@ 
 	wp_cache_delete("get_field_groups", 'acf');
 	
 	
-    // return
-    return $field_group;
+	// return
+	return $field_group;
 	
 }
 

Spacing +140 added lines, -140 removed lines

@@ -13,22 +13,22 @@ 
 *  @return	(boolean)
 */
 
-function acf_is_field_group_key( $key = '' ) {
+function acf_is_field_group_key($key = '') {
 	
 	// bail early if not string
-	if( !is_string($key) ) return false;
+	if ( ! is_string($key)) return false;
 	
 	
 	// bail early if is numeric (could be numeric string '123')
-	if( is_numeric($key) ) return false;
+	if (is_numeric($key)) return false;
 	
 	
 	// look for 'field_' prefix
-	if( substr($key, 0, 6) === 'group_' ) return true;
+	if (substr($key, 0, 6) === 'group_') return true;
 	
 	
 	// allow local field group key to not start with prefix
-	if( acf_is_local_field_group($key) ) return true;
+	if (acf_is_local_field_group($key)) return true;
 	
 	
 	// return
@@ -50,10 +50,10 @@ 
 *  @return	$field_group (array)
 */
 
-function acf_get_valid_field_group( $field_group = false ) {
+function acf_get_valid_field_group($field_group = false) {
 	
 	// parse in defaults
-	$field_group = acf_parse_args( $field_group, array(
+	$field_group = acf_parse_args($field_group, array(
 		'ID'					=> 0,
 		'key'					=> '',
 		'title'					=> '',
@@ -71,7 +71,7 @@ 
 	
 	
 	// translate
-	acf_translate_keys( $field_group, acf_get_setting('l10n_field_group') );
+	acf_translate_keys($field_group, acf_get_setting('l10n_field_group'));
 		
 	
 	// filter
@@ -97,7 +97,7 @@ 
 *  @return	$field_groups (array)
 */
 
-function acf_get_field_groups( $args = false ) {
+function acf_get_field_groups($args = false) {
 	
 	// vars
 	$field_groups = array();
@@ -105,11 +105,11 @@ 
 	
 	// cache
 	$found = false;
-	$cache = wp_cache_get( 'get_field_groups', 'acf', false, $found );
+	$cache = wp_cache_get('get_field_groups', 'acf', false, $found);
 	
-	if( $found ) {
+	if ($found) {
 		
-		return acf_filter_field_groups( $cache, $args );
+		return acf_filter_field_groups($cache, $args);
 		
 	}
 	
@@ -127,12 +127,12 @@ 
 	
 	
 	// loop through and load field groups
-	if( $posts ) {
+	if ($posts) {
 		
-		foreach( $posts as $post ) {
+		foreach ($posts as $post) {
 			
 			// add to return array
-			$field_groups[] = acf_get_field_group( $post );
+			$field_groups[] = acf_get_field_group($post);
 			
 		}
 		
@@ -144,11 +144,11 @@ 
 	
 	
 	// set cache
-	wp_cache_set( 'get_field_groups', $field_groups, 'acf' );
+	wp_cache_set('get_field_groups', $field_groups, 'acf');
 			
 	
 	// return		
-	return acf_filter_field_groups( $field_groups, $args );
+	return acf_filter_field_groups($field_groups, $args);
 	
 }
 
@@ -167,10 +167,10 @@ 
 *  @return	$field_groups (array)
 */
 
-function acf_filter_field_groups( $field_groups, $args = false ) {
+function acf_filter_field_groups($field_groups, $args = false) {
 	
 	// bail early if empty sargs
-	if( empty($args) || empty($field_groups) ) {
+	if (empty($args) || empty($field_groups)) {
 		
 		return $field_groups;
 		
@@ -178,20 +178,20 @@ 
 	
 	
 	// vars
-	$keys = array_keys( $field_groups );
+	$keys = array_keys($field_groups);
 	
 	
 	// loop through keys
-	foreach( $keys as $key ) {
+	foreach ($keys as $key) {
 		
 		// get visibility
-		$visibility = acf_get_field_group_visibility( $field_groups[ $key ], $args );
+		$visibility = acf_get_field_group_visibility($field_groups[$key], $args);
 		
 		
 		// unset
-		if( !$visibility ) {
+		if ( ! $visibility) {
 			
-			unset($field_groups[ $key ]);
+			unset($field_groups[$key]);
 			
 		}
 		
@@ -199,7 +199,7 @@ 
 	
 	
 	// re assign index
-	$field_groups = array_values( $field_groups );
+	$field_groups = array_values($field_groups);
 	
 	
 	// return
@@ -222,7 +222,7 @@ 
 *  @return	$field_group (array)
 */
 
-function acf_get_field_group( $selector = false ) {
+function acf_get_field_group($selector = false) {
 	
 	// vars
 	$field_group = false;
@@ -231,16 +231,16 @@ 
 	
 	
 	// $post_id or $key
-	if( is_numeric($selector) ) {
+	if (is_numeric($selector)) {
 		
 		$v = $selector;
 		
-	} elseif( is_string($selector) ) {
+	} elseif (is_string($selector)) {
 		
 		$k = 'key';
 		$v = $selector;
 		
-	} elseif( is_object($selector) ) {
+	} elseif (is_object($selector)) {
 		
 		$v = $selector->ID;
 		
@@ -257,19 +257,19 @@ 
 	
 	// get cache
 	$found = false;
-	$cache = wp_cache_get( $cache_key, 'acf', false, $found );
+	$cache = wp_cache_get($cache_key, 'acf', false, $found);
 	
-	if( $found ) return $cache;
+	if ($found) return $cache;
 	
 	
 	// get field group from ID or key
-	if( $k == 'ID' ) {
+	if ($k == 'ID') {
 		
-		$field_group = _acf_get_field_group_by_id( $v );
+		$field_group = _acf_get_field_group_by_id($v);
 		
 	} else {
 		
-		$field_group = _acf_get_field_group_by_key( $v );
+		$field_group = _acf_get_field_group_by_key($v);
 		
 	}
 	
@@ -279,7 +279,7 @@ 
 	
 	
 	// set cache
-	wp_cache_set( $cache_key, $field_group, 'acf' );
+	wp_cache_set($cache_key, $field_group, 'acf');
 	
 	
 	// return
@@ -300,14 +300,14 @@ 
 *  @return	$field_group (array)
 */
 
-function _acf_get_field_group_by_id( $post_id = 0 ) {
+function _acf_get_field_group_by_id($post_id = 0) {
 	
 	// get post
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	
 	
 	// bail early if no post, or is not a field group
-	if( empty($post) || $post->post_type != 'acf-field-group' ) {
+	if (empty($post) || $post->post_type != 'acf-field-group') {
 	
 		return false;
 		
@@ -315,7 +315,7 @@ 
 	
 	
 	// modify post_status (new field-group starts as auto-draft)
-	if( $post->post_status == 'auto-draft' ) {
+	if ($post->post_status == 'auto-draft') {
 		
 		$post->post_status = 'publish';
 		
@@ -323,7 +323,7 @@ 
 	
 	
 	// unserialize data
-	$field_group = maybe_unserialize( $post->post_content );
+	$field_group = maybe_unserialize($post->post_content);
 	
 	
 	// update attributes
@@ -335,10 +335,10 @@ 
 	
 	
 	// is JSON
-	if( acf_is_local_field_group( $field_group['key'] ) ) {
+	if (acf_is_local_field_group($field_group['key'])) {
 		
 		// override
-		$field_group = acf_get_local_field_group( $field_group['key'] );
+		$field_group = acf_get_local_field_group($field_group['key']);
 		
 		
 		// restore ID
@@ -348,7 +348,7 @@ 
 	
 		
 	// validate
-	$field_group = acf_get_valid_field_group( $field_group );
+	$field_group = acf_get_valid_field_group($field_group);
 
 	
 	// return
@@ -370,19 +370,19 @@ 
 *  @return	$field_group (array)
 */
 
-function _acf_get_field_group_by_key( $key = '' ) {
+function _acf_get_field_group_by_key($key = '') {
 	
 	// vars
 	$field_group = false;
 		
 	
 	// try JSON before DB to save query time
-	if( acf_is_local_field_group( $key ) ) {
+	if (acf_is_local_field_group($key)) {
 		
-		$field_group = acf_get_local_field_group( $key );
+		$field_group = acf_get_local_field_group($key);
 		
 		// validate
-		$field_group = acf_get_valid_field_group( $field_group );
+		$field_group = acf_get_valid_field_group($field_group);
 	
 		// return
 		return $field_group;
@@ -403,11 +403,11 @@ 
 	
 	
 	// load posts
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 	
 	
 	// validate
-	if( empty($posts[0]) ) {
+	if (empty($posts[0])) {
 	
 		return $field_group;
 			
@@ -415,7 +415,7 @@ 
 	
 	
 	// load from ID
-	$field_group = _acf_get_field_group_by_id( $posts[0]->ID );
+	$field_group = _acf_get_field_group_by_id($posts[0]->ID);
 	
 	
 	// return
@@ -438,22 +438,22 @@ 
 *  @return	$field_group (array)
 */
 
-function acf_update_field_group( $field_group = array() ) {
+function acf_update_field_group($field_group = array()) {
 	
 	// validate
-	$field_group = acf_get_valid_field_group( $field_group );
+	$field_group = acf_get_valid_field_group($field_group);
 	
 	
 	// may have been posted. Remove slashes
-	$field_group = wp_unslash( $field_group );
+	$field_group = wp_unslash($field_group);
 	
 	
 	// locations may contain 'uniquid' array keys
-	$field_group['location'] = array_values( $field_group['location'] );
+	$field_group['location'] = array_values($field_group['location']);
 	
-	foreach( $field_group['location'] as $k => $v ) {
+	foreach ($field_group['location'] as $k => $v) {
 		
-		$field_group['location'][ $k ] = array_values( $v );
+		$field_group['location'][$k] = array_values($v);
 		
 	}
 	
@@ -474,7 +474,7 @@ 
 	
 	
 	// vars
-	$data = maybe_serialize( $data );
+	$data = maybe_serialize($data);
     $post_status = $extract['active'] ? 'publish' : 'acf-disabled';
     
     
@@ -492,17 +492,17 @@ 
     
     
     // allow field groups to contain the same name
-	add_filter( 'wp_unique_post_slug', 'acf_update_field_group_wp_unique_post_slug', 100, 6 ); 
+	add_filter('wp_unique_post_slug', 'acf_update_field_group_wp_unique_post_slug', 100, 6); 
 	
     
     // update the field group and update the ID
-    if( $field_group['ID'] ) {
+    if ($field_group['ID']) {
 	    
-	    wp_update_post( $save );
+	    wp_update_post($save);
 	    
     } else {
 	    
-	    $field_group['ID'] = wp_insert_post( $save );
+	    $field_group['ID'] = wp_insert_post($save);
 	    
     }
 	
@@ -522,9 +522,9 @@ 
 	
 }
 
-function acf_update_field_group_wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
+function acf_update_field_group_wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug) {
 		
-	if( $post_type == 'acf-field-group' ) {
+	if ($post_type == 'acf-field-group') {
 	
 		$slug = $original_slug;
 	
@@ -548,18 +548,18 @@ 
 *  @return	$field_group (array)
 */
 
-function acf_duplicate_field_group( $selector = 0, $new_post_id = 0 ) {
+function acf_duplicate_field_group($selector = 0, $new_post_id = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field_group = acf_get_field_group( $selector );
+	$field_group = acf_get_field_group($selector);
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) {
+	if (empty($field_group)) {
 	
 		return false;
 		
@@ -576,23 +576,23 @@ 
 	
 	
 	// add (copy)
-	if( !$new_post_id ) {
+	if ( ! $new_post_id) {
 		
-		$field_group['title'] .= ' (' . __("copy", 'acf') . ')';
+		$field_group['title'] .= ' ('.__("copy", 'acf').')';
 		
 	}
 	
 	
 	// save
-	$field_group = acf_update_field_group( $field_group );
+	$field_group = acf_update_field_group($field_group);
 	
 	
 	// get fields
-	$fields = acf_get_fields( $orig_field_group );
+	$fields = acf_get_fields($orig_field_group);
 	
 	
 	// duplicate fields
-	acf_duplicate_fields( $fields, $field_group['ID'] );
+	acf_duplicate_fields($fields, $field_group['ID']);
 	
 	
 	// action for 3rd party customization
@@ -618,16 +618,16 @@ 
 *  @return	(int)
 */
 
-function acf_get_field_count( $field_group ) {
+function acf_get_field_count($field_group) {
 	
 	// vars
 	$count = 0;
 	
 	
 	// local
-	if( !$field_group['ID'] ) {
+	if ( ! $field_group['ID']) {
 		
-		$count = acf_count_local_fields( $field_group['key'] );	
+		$count = acf_count_local_fields($field_group['key']);	
 	
 	// DB	
 	} else {
@@ -672,29 +672,29 @@ 
 *  @return	(boolean)
 */
 
-function acf_delete_field_group( $selector = 0 ) {
+function acf_delete_field_group($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field_group = acf_get_field_group( $selector );
+	$field_group = acf_get_field_group($selector);
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if (empty($field_group)) return false;
 	
 	
 	// get fields
 	$fields = acf_get_fields($field_group);
 	
 	
-	if( !empty($fields) ) {
+	if ( ! empty($fields)) {
 	
-		foreach( $fields as $field ) {
+		foreach ($fields as $field) {
 			
-			acf_delete_field( $field['ID'] );
+			acf_delete_field($field['ID']);
 		
 		}
 	
@@ -702,7 +702,7 @@ 
 	
 	
 	// delete
-	wp_delete_post( $field_group['ID'] );
+	wp_delete_post($field_group['ID']);
 	
 	
 	// action for 3rd party customization
@@ -727,29 +727,29 @@ 
 *  @return	(boolean)
 */
 
-function acf_trash_field_group( $selector = 0 ) {
+function acf_trash_field_group($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field_group = acf_get_field_group( $selector );
+	$field_group = acf_get_field_group($selector);
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if (empty($field_group)) return false;
 	
 	
 	// get fields
 	$fields = acf_get_fields($field_group);
 	
 	
-	if( !empty($fields) ) {
+	if ( ! empty($fields)) {
 	
-		foreach( $fields as $field ) {
+		foreach ($fields as $field) {
 			
-			acf_trash_field( $field['ID'] );
+			acf_trash_field($field['ID']);
 			
 		}
 		
@@ -757,7 +757,7 @@ 
 	
 	
 	// delete
-	wp_trash_post( $field_group['ID'] );
+	wp_trash_post($field_group['ID']);
 	
 	
 	// action for 3rd party customization
@@ -782,29 +782,29 @@ 
 *  @return	(boolean)
 */
 
-function acf_untrash_field_group( $selector = 0 ) {
+function acf_untrash_field_group($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field_group = acf_get_field_group( $selector );
+	$field_group = acf_get_field_group($selector);
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if (empty($field_group)) return false;
 	
 	
 	// get fields
 	$fields = acf_get_fields($field_group);
 	
 	
-	if( !empty($fields) ) {
+	if ( ! empty($fields)) {
 	
-		foreach( $fields as $field ) {
+		foreach ($fields as $field) {
 			
-			acf_untrash_field( $field['ID'] );
+			acf_untrash_field($field['ID']);
 		
 		}
 	
@@ -812,7 +812,7 @@ 
 	
 	
 	// delete
-	wp_untrash_post( $field_group['ID'] );
+	wp_untrash_post($field_group['ID']);
 	
 	
 	// action for 3rd party customization
@@ -838,91 +838,91 @@ 
 *  @return	n/a
 */
 
-function acf_get_field_group_style( $field_group ) {
+function acf_get_field_group_style($field_group) {
 	
 	// vars
 	$e = '';
 	
 	
 	// validate
-	if( !is_array($field_group['hide_on_screen']) )
+	if ( ! is_array($field_group['hide_on_screen']))
 	{
 		return $e;
 	}
 	
 	
 	// add style to html
-	if( in_array('permalink',$field_group['hide_on_screen']) )
+	if (in_array('permalink', $field_group['hide_on_screen']))
 	{
 		$e .= '#edit-slug-box {display: none;} ';
 	}
 	
-	if( in_array('the_content',$field_group['hide_on_screen']) )
+	if (in_array('the_content', $field_group['hide_on_screen']))
 	{
 		$e .= '#postdivrich {display: none;} ';
 	}
 	
-	if( in_array('excerpt',$field_group['hide_on_screen']) )
+	if (in_array('excerpt', $field_group['hide_on_screen']))
 	{
 		$e .= '#postexcerpt, #screen-meta label[for=postexcerpt-hide] {display: none;} ';
 	}
 	
-	if( in_array('custom_fields',$field_group['hide_on_screen']) )
+	if (in_array('custom_fields', $field_group['hide_on_screen']))
 	{
 		$e .= '#postcustom, #screen-meta label[for=postcustom-hide] { display: none; } ';
 	}
 	
-	if( in_array('discussion',$field_group['hide_on_screen']) )
+	if (in_array('discussion', $field_group['hide_on_screen']))
 	{
 		$e .= '#commentstatusdiv, #screen-meta label[for=commentstatusdiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('comments',$field_group['hide_on_screen']) )
+	if (in_array('comments', $field_group['hide_on_screen']))
 	{
 		$e .= '#commentsdiv, #screen-meta label[for=commentsdiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('slug',$field_group['hide_on_screen']) )
+	if (in_array('slug', $field_group['hide_on_screen']))
 	{
 		$e .= '#slugdiv, #screen-meta label[for=slugdiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('author',$field_group['hide_on_screen']) )
+	if (in_array('author', $field_group['hide_on_screen']))
 	{
 		$e .= '#authordiv, #screen-meta label[for=authordiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('format',$field_group['hide_on_screen']) )
+	if (in_array('format', $field_group['hide_on_screen']))
 	{
 		$e .= '#formatdiv, #screen-meta label[for=formatdiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('page_attributes',$field_group['hide_on_screen']) )
+	if (in_array('page_attributes', $field_group['hide_on_screen']))
 	{
 		$e .= '#pageparentdiv {display: none;} ';
 	}
 
-	if( in_array('featured_image',$field_group['hide_on_screen']) )
+	if (in_array('featured_image', $field_group['hide_on_screen']))
 	{
 		$e .= '#postimagediv, #screen-meta label[for=postimagediv-hide] {display: none;} ';
 	}
 	
-	if( in_array('revisions',$field_group['hide_on_screen']) )
+	if (in_array('revisions', $field_group['hide_on_screen']))
 	{
 		$e .= '#revisionsdiv, #screen-meta label[for=revisionsdiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('categories',$field_group['hide_on_screen']) )
+	if (in_array('categories', $field_group['hide_on_screen']))
 	{
 		$e .= '#categorydiv, #screen-meta label[for=categorydiv-hide] {display: none;} ';
 	}
 	
-	if( in_array('tags',$field_group['hide_on_screen']) )
+	if (in_array('tags', $field_group['hide_on_screen']))
 	{
 		$e .= '#tagsdiv-post_tag, #screen-meta label[for=tagsdiv-post_tag-hide] {display: none;} ';
 	}
 	
-	if( in_array('send-trackbacks',$field_group['hide_on_screen']) )
+	if (in_array('send-trackbacks', $field_group['hide_on_screen']))
 	{
 		$e .= '#trackbacksdiv, #screen-meta label[for=trackbacksdiv-hide] {display: none;} ';
 	}
@@ -946,7 +946,7 @@ 
 *  @return	$id (int)
 */
 
-function acf_import_field_group( $field_group ) {
+function acf_import_field_group($field_group) {
 	
 	// vars
 	$ref = array();
@@ -958,24 +958,24 @@ 
 	
 	
 	// format fields
-	$fields = acf_prepare_fields_for_import( $fields );
+	$fields = acf_prepare_fields_for_import($fields);
 	
 	
 	// remove old fields
-	if( $field_group['ID'] ) {
+	if ($field_group['ID']) {
 		
 		// disable local - important as to avoid 'acf_get_fields_by_id' returning fields with ID = 0
 		acf_disable_local();
 	
 		
 		// load fields
-		$db_fields = acf_get_fields_by_id( $field_group['ID'] );
-		$db_fields = acf_prepare_fields_for_import( $db_fields );
+		$db_fields = acf_get_fields_by_id($field_group['ID']);
+		$db_fields = acf_prepare_fields_for_import($db_fields);
 		
 		
 		// get field keys
 		$keys = array();
-		foreach( $fields as $field ) {
+		foreach ($fields as $field) {
 			
 			$keys[] = $field['key'];
 			
@@ -983,15 +983,15 @@ 
 		
 		
 		// loop over db fields
-		foreach( $db_fields as $field ) {
+		foreach ($db_fields as $field) {
 			
 			// add to ref
-			$ref[ $field['key'] ] = $field['ID'];
+			$ref[$field['key']] = $field['ID'];
 			
 			
-			if( !in_array($field['key'], $keys) ) {
+			if ( ! in_array($field['key'], $keys)) {
 				
-				acf_delete_field( $field['ID'] );
+				acf_delete_field($field['ID']);
 				
 			}
 			
@@ -1005,57 +1005,57 @@ 
 	
 			
 	// save field group
-	$field_group = acf_update_field_group( $field_group );
+	$field_group = acf_update_field_group($field_group);
 	
 	
 	// add to ref
-	$ref[ $field_group['key'] ] = $field_group['ID'];
+	$ref[$field_group['key']] = $field_group['ID'];
 	
 	
 	// add to order
-	$order[ $field_group['ID'] ] = 0;
+	$order[$field_group['ID']] = 0;
 	
 	
 	// add fields
-	foreach( $fields as $field ) {
+	foreach ($fields as $field) {
 		
 		// add ID
-		if( !$field['ID'] && isset($ref[ $field['key'] ]) ) {
+		if ( ! $field['ID'] && isset($ref[$field['key']])) {
 			
-			$field['ID'] = $ref[ $field['key'] ];	
+			$field['ID'] = $ref[$field['key']];	
 			
 		}
 		
 		
 		// add parent
-		if( empty($field['parent']) ) {
+		if (empty($field['parent'])) {
 			
 			$field['parent'] = $field_group['ID'];
 			
-		} elseif( isset($ref[ $field['parent'] ]) ) {
+		} elseif (isset($ref[$field['parent']])) {
 			
-			$field['parent'] = $ref[ $field['parent'] ];
+			$field['parent'] = $ref[$field['parent']];
 				
 		}
 		
 		
 		// add field menu_order
-		if( !isset($order[ $field['parent'] ]) ) {
+		if ( ! isset($order[$field['parent']])) {
 			
-			$order[ $field['parent'] ] = 0;
+			$order[$field['parent']] = 0;
 			
 		}
 		
-		$field['menu_order'] = $order[ $field['parent'] ];
-		$order[ $field['parent'] ]++;
+		$field['menu_order'] = $order[$field['parent']];
+		$order[$field['parent']]++;
 		
 		
 		// save field
-		$field = acf_update_field( $field );
+		$field = acf_update_field($field);
 		
 		
 		// add to ref
-		$ref[ $field['key'] ] = $field['ID'];
+		$ref[$field['key']] = $field['ID'];
 		
 	}
 	
@@ -1079,14 +1079,14 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_prepare_field_group_for_export( $field_group ) {
+function acf_prepare_field_group_for_export($field_group) {
 	
 	// extract field group ID
-	$id = acf_extract_var( $field_group, 'ID' );
+	$id = acf_extract_var($field_group, 'ID');
 	
 	
 	// prepare fields
-	$field_group['fields'] = acf_prepare_fields_for_export( $field_group['fields'] );
+	$field_group['fields'] = acf_prepare_fields_for_export($field_group['fields']);
 	
 	
 	// filter for 3rd party customization

Braces +24 added lines, -8 removed lines

@@ -16,19 +16,27 @@ 
 function acf_is_field_group_key( $key = '' ) {
 	
 	// bail early if not string
-	if( !is_string($key) ) return false;
+	if( !is_string($key) ) {
+		return false;
+	}
 	
 	
 	// bail early if is numeric (could be numeric string '123')
-	if( is_numeric($key) ) return false;
+	if( is_numeric($key) ) {
+		return false;
+	}
 	
 	
 	// look for 'field_' prefix
-	if( substr($key, 0, 6) === 'group_' ) return true;
+	if( substr($key, 0, 6) === 'group_' ) {
+		return true;
+	}
 	
 	
 	// allow local field group key to not start with prefix
-	if( acf_is_local_field_group($key) ) return true;
+	if( acf_is_local_field_group($key) ) {
+		return true;
+	}
 	
 	
 	// return
@@ -259,7 +267,9 @@ 
 	$found = false;
 	$cache = wp_cache_get( $cache_key, 'acf', false, $found );
 	
-	if( $found ) return $cache;
+	if( $found ) {
+		return $cache;
+	}
 	
 	
 	// get field group from ID or key
@@ -683,7 +693,9 @@ 
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if( empty($field_group) ) {
+		return false;
+	}
 	
 	
 	// get fields
@@ -738,7 +750,9 @@ 
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if( empty($field_group) ) {
+		return false;
+	}
 	
 	
 	// get fields
@@ -793,7 +807,9 @@ 
 	
 	
 	// bail early if field group did not load correctly
-	if( empty($field_group) ) return false;
+	if( empty($field_group) ) {
+		return false;
+	}
 	
 	
 	// get fields

includes/acf/api/api-value.php

Indentation +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	// add or update
 	if( get_option($option) !== false ) {
 	
-	    $return = update_option( $option, $value );
+		$return = update_option( $option, $value );
 	    
 	} else {
 		

Spacing +70 added lines, -70 removed lines

@@ -15,52 +15,52 @@ 
 *  @return	$return (mixed)
 */
 
-function acf_get_metadata( $post_id = 0, $name = '', $hidden = false ) {
+function acf_get_metadata($post_id = 0, $name = '', $hidden = false) {
 	
 	// vars
 	$value = null;
 	
 	
 	// add prefix for hidden meta
-	if( $hidden ) {
+	if ($hidden) {
 		
-		$name = '_' . $name;
+		$name = '_'.$name;
 		
 	}
 	
 	
 	// post
-	if( is_numeric($post_id) ) {
+	if (is_numeric($post_id)) {
 		
-		$meta = get_metadata( 'post', $post_id, $name, false );
+		$meta = get_metadata('post', $post_id, $name, false);
 		
-		if( isset($meta[0]) ) {
+		if (isset($meta[0])) {
 		
 		 	$value = $meta[0];
 		 	
 	 	}
 	
 	// user
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
+	} elseif (substr($post_id, 0, 5) == 'user_') {
 		
 		$user_id = (int) substr($post_id, 5);
 		
-		$meta = get_metadata( 'user', $user_id, $name, false );
+		$meta = get_metadata('user', $user_id, $name, false);
 		
-		if( isset($meta[0]) ) {
+		if (isset($meta[0])) {
 		
 		 	$value = $meta[0];
 		 	
 	 	}
 	
 	// comment
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
+	} elseif (substr($post_id, 0, 8) == 'comment_') {
 		
 		$comment_id = (int) substr($post_id, 8);
 		
-		$meta = get_metadata( 'comment', $comment_id, $name, false );
+		$meta = get_metadata('comment', $comment_id, $name, false);
 		
-		if( isset($meta[0]) ) {
+		if (isset($meta[0])) {
 		
 		 	$value = $meta[0];
 		 	
@@ -69,14 +69,14 @@ 
 	} else {
 		
 		// modify prefix for hidden meta
-		if( $hidden ) {
+		if ($hidden) {
 			
-			$post_id = '_' . $post_id;
+			$post_id = '_'.$post_id;
 			$name = substr($name, 1);
 			
 		}
 		
-		$value = get_option( $post_id . '_' . $name, null );
+		$value = get_option($post_id.'_'.$name, null);
 		
 	}
 		
@@ -103,34 +103,34 @@ 
 *  @return	$return (boolean)
 */
 
-function acf_update_metadata( $post_id = 0, $name = '', $value = '', $hidden = false ) {
+function acf_update_metadata($post_id = 0, $name = '', $value = '', $hidden = false) {
 	
 	// vars
 	$return = false;
 	
 	
 	// add prefix for hidden meta
-	if( $hidden ) {
+	if ($hidden) {
 		
-		$name = '_' . $name;
+		$name = '_'.$name;
 		
 	}
 	
 	
 	// postmeta
-	if( is_numeric($post_id) ) {
+	if (is_numeric($post_id)) {
 		
-		$return = update_metadata('post', $post_id, $name, $value );
+		$return = update_metadata('post', $post_id, $name, $value);
 	
 	// usermeta
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
+	} elseif (substr($post_id, 0, 5) == 'user_') {
 		
 		$user_id = (int) substr($post_id, 5);
 		
 		$return = update_metadata('user', $user_id, $name, $value);
 		
 	// commentmeta
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
+	} elseif (substr($post_id, 0, 8) == 'comment_') {
 		
 		$comment_id = (int) substr($post_id, 8);
 		
@@ -140,14 +140,14 @@ 
 	} else {
 		
 		// modify prefix for hidden meta
-		if( $hidden ) {
+		if ($hidden) {
 			
-			$post_id = '_' . $post_id;
+			$post_id = '_'.$post_id;
 			$name = substr($name, 1);
 			
 		}
 		
-		$return = acf_update_option( $post_id . '_' . $name, $value );
+		$return = acf_update_option($post_id.'_'.$name, $value);
 		
 	}
 	
@@ -173,34 +173,34 @@ 
 *  @return	$return (boolean)
 */
 
-function acf_delete_metadata( $post_id = 0, $name = '', $hidden = false ) {
+function acf_delete_metadata($post_id = 0, $name = '', $hidden = false) {
 	
 	// vars
 	$return = false;
 	
 	
 	// add prefix for hidden meta
-	if( $hidden ) {
+	if ($hidden) {
 		
-		$name = '_' . $name;
+		$name = '_'.$name;
 		
 	}
 	
 	
 	// postmeta
-	if( is_numeric($post_id) ) {
+	if (is_numeric($post_id)) {
 		
-		$return = delete_metadata('post', $post_id, $name );
+		$return = delete_metadata('post', $post_id, $name);
 	
 	// usermeta
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
+	} elseif (substr($post_id, 0, 5) == 'user_') {
 		
 		$user_id = (int) substr($post_id, 5);
 		
 		$return = delete_metadata('user', $user_id, $name);
 		
 	// commentmeta
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
+	} elseif (substr($post_id, 0, 8) == 'comment_') {
 		
 		$comment_id = (int) substr($post_id, 8);
 		
@@ -210,14 +210,14 @@ 
 	} else {
 		
 		// modify prefix for hidden meta
-		if( $hidden ) {
+		if ($hidden) {
 			
-			$post_id = '_' . $post_id;
+			$post_id = '_'.$post_id;
 			$name = substr($name, 1);
 			
 		}
 		
-		$return = delete_option( $post_id . '_' . $name );
+		$return = delete_option($post_id.'_'.$name);
 		
 	}
 	
@@ -243,7 +243,7 @@ 
 *  @return	(boolean)
 */
 
-function acf_update_option( $option = '', $value = '', $autoload = null ) {
+function acf_update_option($option = '', $value = '', $autoload = null) {
 	
 	// vars
 	$deprecated = '';
@@ -251,7 +251,7 @@ 
 	
 	
 	// autoload
-	if( $autoload === null ){
+	if ($autoload === null) {
 		
 		$autoload = acf_get_setting('autoload') ? 'yes' : 'no';
 		
@@ -265,13 +265,13 @@ 
 		
 		
 	// add or update
-	if( get_option($option) !== false ) {
+	if (get_option($option) !== false) {
 	
-	    $return = update_option( $option, $value );
+	    $return = update_option($option, $value);
 	    
 	} else {
 		
-		$return = add_option( $option, $value, $deprecated, $autoload );
+		$return = add_option($option, $value, $deprecated, $autoload);
 		
 	}
 	
@@ -296,17 +296,17 @@ 
 *  @return	(mixed)
 */
 
-function acf_get_value( $post_id = 0, $field ) {
+function acf_get_value($post_id = 0, $field) {
 	
 	// bail early if no $post_id (acf_form - new_post)
-	if( !$post_id ) return null;
+	if ( ! $post_id) return null;
 	
 	
 	// try cache
 	$found = false;
-	$cache = wp_cache_get( "load_value/post_id={$post_id}/name={$field['name']}", 'acf', false, $found );
+	$cache = wp_cache_get("load_value/post_id={$post_id}/name={$field['name']}", 'acf', false, $found);
 	
-	if( $found ) {
+	if ($found) {
 	
 		return $cache;
 		
@@ -314,15 +314,15 @@ 
 	
 	
 	// load value
-	$value = acf_get_metadata( $post_id, $field['name'] );
+	$value = acf_get_metadata($post_id, $field['name']);
 	
 	
 	// if value was duplicated, it may now be a serialized string!
-	$value = maybe_unserialize( $value );
+	$value = maybe_unserialize($value);
 	
 	
 	// no value? try default_value
-	if( $value === null && isset($field['default_value']) ) {
+	if ($value === null && isset($field['default_value'])) {
 		
 		$value = $field['default_value'];
 		
@@ -330,14 +330,14 @@ 
 	
 	
 	// filter for 3rd party customization
-	$value = apply_filters( "acf/load_value", $value, $post_id, $field );
-	$value = apply_filters( "acf/load_value/type={$field['type']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/load_value/name={$field['name']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/load_value/key={$field['key']}", $value, $post_id, $field );
+	$value = apply_filters("acf/load_value", $value, $post_id, $field);
+	$value = apply_filters("acf/load_value/type={$field['type']}", $value, $post_id, $field);
+	$value = apply_filters("acf/load_value/name={$field['name']}", $value, $post_id, $field);
+	$value = apply_filters("acf/load_value/key={$field['key']}", $value, $post_id, $field);
 	
 	
 	// update cache
-	wp_cache_set( "load_value/post_id={$post_id}/name={$field['name']}", $value, 'acf' );
+	wp_cache_set("load_value/post_id={$post_id}/name={$field['name']}", $value, 'acf');
 
 	
 	// return
@@ -361,13 +361,13 @@ 
 *  @return	$value
 */
 
-function acf_format_value( $value, $post_id, $field ) {
+function acf_format_value($value, $post_id, $field) {
 	
 	// apply filters
-	$value = apply_filters( "acf/format_value", $value, $post_id, $field );
-	$value = apply_filters( "acf/format_value/type={$field['type']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/format_value/name={$field['name']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/format_value/key={$field['key']}", $value, $post_id, $field );
+	$value = apply_filters("acf/format_value", $value, $post_id, $field);
+	$value = apply_filters("acf/format_value/type={$field['type']}", $value, $post_id, $field);
+	$value = apply_filters("acf/format_value/name={$field['name']}", $value, $post_id, $field);
+	$value = apply_filters("acf/format_value/key={$field['key']}", $value, $post_id, $field);
 	
 	
 	// return
@@ -390,10 +390,10 @@ 
 *  @return	(boolean)
 */
 
-function acf_update_value( $value = null, $post_id = 0, $field ) {
+function acf_update_value($value = null, $post_id = 0, $field) {
 	
 	// strip slashes
-	if( acf_get_setting('stripslashes') ) {
+	if (acf_get_setting('stripslashes')) {
 		
 		$value = stripslashes_deep($value);
 		
@@ -401,22 +401,22 @@ 
 	
 	
 	// filter for 3rd party customization
-	$value = apply_filters( "acf/update_value", $value, $post_id, $field );
-	$value = apply_filters( "acf/update_value/type={$field['type']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/update_value/name={$field['name']}", $value, $post_id, $field );
-	$value = apply_filters( "acf/update_value/key={$field['key']}", $value, $post_id, $field );
+	$value = apply_filters("acf/update_value", $value, $post_id, $field);
+	$value = apply_filters("acf/update_value/type={$field['type']}", $value, $post_id, $field);
+	$value = apply_filters("acf/update_value/name={$field['name']}", $value, $post_id, $field);
+	$value = apply_filters("acf/update_value/key={$field['key']}", $value, $post_id, $field);
 	
 
 	// update value
-	$return = acf_update_metadata( $post_id, $field['name'], $value );
+	$return = acf_update_metadata($post_id, $field['name'], $value);
 	
 	
 	// update reference
-	acf_update_metadata( $post_id, $field['name'], $field['key'], true );
+	acf_update_metadata($post_id, $field['name'], $field['key'], true);
 	
 	
 	// clear cache
-	wp_cache_delete( "load_value/post_id={$post_id}/name={$field['name']}", 'acf' );
+	wp_cache_delete("load_value/post_id={$post_id}/name={$field['name']}", 'acf');
 
 	
 	// return
@@ -439,7 +439,7 @@ 
 *  @return	(boolean)
 */
 
-function acf_delete_value( $post_id = 0, $field ) {
+function acf_delete_value($post_id = 0, $field) {
 	
 	// action for 3rd party customization
 	do_action("acf/delete_value", $post_id, $field['name'], $field);
@@ -449,15 +449,15 @@ 
 	
 	
 	// delete value
-	$return = acf_delete_metadata( $post_id, $field['name'] );
+	$return = acf_delete_metadata($post_id, $field['name']);
 	
 	
 	// delete reference
-	acf_delete_metadata( $post_id, $field['name'], true );
+	acf_delete_metadata($post_id, $field['name'], true);
 	
 	
 	// clear cache
-	wp_cache_delete( "load_value/post_id={$post_id}/name={$field['name']}", 'acf' );
+	wp_cache_delete("load_value/post_id={$post_id}/name={$field['name']}", 'acf');
 	
 	
 	// return

Braces +3 added lines, -1 removed lines

@@ -299,7 +299,9 @@
 function acf_get_value( $post_id = 0, $field ) {
 	
 	// bail early if no $post_id (acf_form - new_post)
-	if( !$post_id ) return null;
+	if( !$post_id ) {
+		return null;
+	}
 	
 	
 	// try cache

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';