rousnay / lighthouse

includes/acf/admin/views/field-group-options.php

Spacing +23 added lines, -23 removed lines

@@ -2,46 +2,46 @@ 
 
 // active
 acf_render_field_wrap(array(
-	'label'			=> __('Status','acf'),
+	'label'			=> __('Status', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'active',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['active'],
 	'choices' 		=> array(
-		1				=>	__("Active",'acf'),
-		0				=>	__("Disabled",'acf'),
+		1				=>	__("Active", 'acf'),
+		0				=>	__("Disabled", 'acf'),
 	)
 ));
 
 
 // style
 acf_render_field_wrap(array(
-	'label'			=> __('Style','acf'),
+	'label'			=> __('Style', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'style',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['style'],
 	'choices' 		=> array(
-		'default'			=>	__("Standard (WP metabox)",'acf'),
-		'seamless'			=>	__("Seamless (no metabox)",'acf'),
+		'default'			=>	__("Standard (WP metabox)", 'acf'),
+		'seamless'			=>	__("Seamless (no metabox)", 'acf'),
 	)
 ));
 
 
 // position
 acf_render_field_wrap(array(
-	'label'			=> __('Position','acf'),
+	'label'			=> __('Position', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'position',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['position'],
 	'choices' 		=> array(
-		'acf_after_title'	=> __("High (after title)",'acf'),
-		'normal'			=> __("Normal (after content)",'acf'),
-		'side' 				=> __("Side",'acf'),
+		'acf_after_title'	=> __("High (after title)", 'acf'),
+		'normal'			=> __("Normal (after content)", 'acf'),
+		'side' 				=> __("Side", 'acf'),
 	),
 	'default_value'	=> 'normal'
 ));
@@ -49,38 +49,38 @@ 
 
 // label_placement
 acf_render_field_wrap(array(
-	'label'			=> __('Label placement','acf'),
+	'label'			=> __('Label placement', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'label_placement',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['label_placement'],
 	'choices' 		=> array(
-		'top'			=>	__("Top aligned",'acf'),
-		'left'			=>	__("Left Aligned",'acf'),
+		'top'			=>	__("Top aligned", 'acf'),
+		'left'			=>	__("Left Aligned", 'acf'),
 	)
 ));
 
 
 // instruction_placement
 acf_render_field_wrap(array(
-	'label'			=> __('Instruction placement','acf'),
+	'label'			=> __('Instruction placement', 'acf'),
 	'instructions'	=> '',
 	'type'			=> 'select',
 	'name'			=> 'instruction_placement',
 	'prefix'		=> 'acf_field_group',
 	'value'			=> $field_group['instruction_placement'],
 	'choices' 		=> array(
-		'label'		=>	__("Below labels",'acf'),
-		'field'		=>	__("Below fields",'acf'),
+		'label'		=>	__("Below labels", 'acf'),
+		'field'		=>	__("Below fields", 'acf'),
 	)
 ));
 
 
 // menu_order
 acf_render_field_wrap(array(
-	'label'			=> __('Order No.','acf'),
-	'instructions'	=> __('Field groups with a lower order will appear first','acf'),
+	'label'			=> __('Order No.', 'acf'),
+	'instructions'	=> __('Field groups with a lower order will appear first', 'acf'),
 	'type'			=> 'number',
 	'name'			=> 'menu_order',
 	'prefix'		=> 'acf_field_group',
@@ -90,8 +90,8 @@ 
 
 // description
 acf_render_field_wrap(array(
-	'label'			=> __('Description','acf'),
-	'instructions'	=> __('Shown in field group list','acf'),
+	'label'			=> __('Description', 'acf'),
+	'instructions'	=> __('Shown in field group list', 'acf'),
 	'type'			=> 'text',
 	'name'			=> 'description',
 	'prefix'		=> 'acf_field_group',
@@ -101,8 +101,8 @@ 
 
 // hide on screen
 acf_render_field_wrap(array(
-	'label'			=> __('Hide on screen','acf'),
-	'instructions'	=> __('<b>Select</b> items to <b>hide</b> them from the edit screen.','acf') . '<br /><br />' . __("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)",'acf'),
+	'label'			=> __('Hide on screen', 'acf'),
+	'instructions'	=> __('<b>Select</b> items to <b>hide</b> them from the edit screen.', 'acf').'<br /><br />'.__("If multiple field groups appear on an edit screen, the first field group's options will be used (the one with the lowest order number)", 'acf'),
 	'type'			=> 'checkbox',
 	'name'			=> 'hide_on_screen',
 	'prefix'		=> 'acf_field_group',
@@ -110,7 +110,7 @@ 
 	'toggle'		=> true,
 	'choices' => array(
 		'permalink'			=>	__("Permalink", 'acf'),
-		'the_content'		=>	__("Content Editor",'acf'),
+		'the_content'		=>	__("Content Editor", 'acf'),
 		'excerpt'			=>	__("Excerpt", 'acf'),
 		'custom_fields'		=>	__("Custom Fields", 'acf'),
 		'discussion'		=>	__("Discussion", 'acf'),

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

Indentation +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@
 				
 				$addon = acf_parse_args($addon, array(
 					"title"			=> "",
-			        "slug"			=> "",
-			        "description"	=> "",
-			        "thumbnail"		=> "",
-			        "url"			=> "",
-			        "btn"			=> __("Download & Install",'acf'),
-			        "btn_color"		=> ""
+					"slug"			=> "",
+					"description"	=> "",
+					"thumbnail"		=> "",
+					"url"			=> "",
+					"btn"			=> __("Download & Install",'acf'),
+					"btn_color"		=> ""
 				));
 				
 				?>

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
 <?php 
 
 // vars
-$json = acf_extract_var( $args, 'json');
+$json = acf_extract_var($args, 'json');
 
 ?>
 <div class="wrap acf-settings-wrap">
 	
-	<h1><?php _e("Add-ons",'acf'); ?></h1>
+	<h1><?php _e("Add-ons", 'acf'); ?></h1>
 	
 	<div class="add-ons-list acf-cf">
 		
-		<?php if( !empty($json) ): ?>
+		<?php if ( ! empty($json)): ?>
 			
-			<?php foreach( $json as $addon ): 
+			<?php foreach ($json as $addon): 
 				
 				$addon = acf_parse_args($addon, array(
 					"title"			=> "",
@@ -20,7 +20,7 @@ 
 			        "description"	=> "",
 			        "thumbnail"		=> "",
 			        "url"			=> "",
-			        "btn"			=> __("Download & Install",'acf'),
+			        "btn"			=> __("Download & Install", 'acf'),
 			        "btn_color"		=> ""
 				));
 				
@@ -38,13 +38,13 @@ 
 						<p><?php echo $addon['description']; ?></p>
 					</div>
 					<div class="footer">
-						<?php if( apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false ) ): ?>
-							<a class="acf-button" disabled="disabled"><?php _e("Installed",'acf'); ?></a>
+						<?php if (apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false)): ?>
+							<a class="acf-button" disabled="disabled"><?php _e("Installed", 'acf'); ?></a>
 						<?php else: ?>
 							<a class="acf-button <?php echo $addon['btn_color']; ?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
 						<?php endif; ?>
 						
-						<?php if( !empty($addon['footer']) ): ?>
+						<?php if ( ! empty($addon['footer'])): ?>
 							<p><?php echo $addon['footer']; ?></p>
 						<?php endif; ?>
 					</div>

Braces +5 added lines, -2 removed lines

@@ -40,8 +40,11 @@
 					<div class="footer">
 						<?php if( apply_filters("acf/is_add_on_active/slug={$addon['slug']}", false ) ): ?>
 							<a class="acf-button" disabled="disabled"><?php _e("Installed",'acf'); ?></a>
-						<?php else: ?>
-							<a class="acf-button <?php echo $addon['btn_color']; ?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
+						<?php else {
+	: ?>
+							<a class="acf-button <?php echo $addon['btn_color'];
+}
+?>" target="_blank" href="<?php echo $addon['url']; ?>" ><?php _e($addon['btn']); ?></a>
 						<?php endif; ?>
 						
 						<?php if( !empty($addon['footer']) ): ?>

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

Spacing +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@ 
 <?php 
 
 // extract args
-extract( $args );
+extract($args);
 
 ?>
 <div class="wrap about-wrap acf-wrap">
 	
-	<h1><?php _e("Welcome to Advanced Custom Fields",'acf'); ?> <?php echo $version; ?></h1>
+	<h1><?php _e("Welcome to Advanced Custom Fields", 'acf'); ?> <?php echo $version; ?></h1>
 	<div class="about-text"><?php printf(__("Thank you for updating! ACF %s is bigger and better than ever before. We hope you like it.", 'acf'), $version); ?></div>
 	<div class="acf-icon logo">
 		<i class="acf-sprite-logo"></i>
 	</div>
 	
 	<h2 class="nav-tab-wrapper">
-		<?php foreach( $tabs as $tab_slug => $tab_title ): ?>
-			<a class="nav-tab<?php if( $active == $tab_slug ): ?> nav-tab-active<?php endif; ?>" href="<?php echo admin_url("edit.php?post_type=acf-field-group&page=acf-settings-info&tab={$tab_slug}"); ?>"><?php echo $tab_title; ?></a>
+		<?php foreach ($tabs as $tab_slug => $tab_title): ?>
+			<a class="nav-tab<?php if ($active == $tab_slug): ?> nav-tab-active<?php endif; ?>" href="<?php echo admin_url("edit.php?post_type=acf-field-group&page=acf-settings-info&tab={$tab_slug}"); ?>"><?php echo $tab_title; ?></a>
 		<?php endforeach; ?>
 	</h2>
 	
-<?php if( $active == 'new' ): ?>
+<?php if ($active == 'new'): ?>
 	
 	<h2 class="about-headline-callout"><?php _e("A smoother custom field experience", 'acf'); ?></h2>
 	
@@ -160,27 +160,27 @@ 
 		
 	
 	
-<?php elseif( $active == 'changelog' ): ?>
+<?php elseif ($active == 'changelog'): ?>
 	
 	<p class="about-description"><?php printf(__("We think you'll love the changes in %s.", 'acf'), $version); ?></p>
 	
 	<?php
 		
-	$items = file_get_contents( acf_get_path('readme.txt') );
-	$items = explode('= ' . $version . ' =', $items);
+	$items = file_get_contents(acf_get_path('readme.txt'));
+	$items = explode('= '.$version.' =', $items);
 	
-	$items = end( $items );
-	$items = current( explode("\n\n", $items) );
-	$items = array_filter( array_map('trim', explode("*", $items)) );
+	$items = end($items);
+	$items = current(explode("\n\n", $items));
+	$items = array_filter(array_map('trim', explode("*", $items)));
 	
 	?>
 	<ul class="changelog">
-	<?php foreach( $items as $item ): 
+	<?php foreach ($items as $item): 
 		
 		$item = explode('http', $item);
 			
 		?>
-		<li><?php echo $item[0]; ?><?php if( isset($item[1]) ): ?><a href="http<?php echo $item[1]; ?>" target="_blank">[...]</a><?php endif; ?></li>
+		<li><?php echo $item[0]; ?><?php if (isset($item[1])): ?><a href="http<?php echo $item[1]; ?>" target="_blank">[...]</a><?php endif; ?></li>
 	<?php endforeach; ?>
 	</ul>
 

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