rousnay / lighthouse

inc/custom-header.php

Spacing +7 added lines, -7 removed lines

@@ -21,18 +21,18 @@ 
  * @uses lighthouse_header_style()
  */
 function lighthouse_custom_header_setup() {
-	add_theme_support( 'custom-header', apply_filters( 'lighthouse_custom_header_args', array(
+	add_theme_support('custom-header', apply_filters('lighthouse_custom_header_args', array(
 		'default-image'          => '',
 		'default-text-color'     => '000000',
 		'width'                  => 1000,
 		'height'                 => 250,
 		'flex-height'            => true,
 		'wp-head-callback'       => 'lighthouse_header_style',
-	) ) );
+	)));
 }
-add_action( 'after_setup_theme', 'lighthouse_custom_header_setup' );
+add_action('after_setup_theme', 'lighthouse_custom_header_setup');
 
-if ( ! function_exists( 'lighthouse_header_style' ) ) :
+if ( ! function_exists('lighthouse_header_style')) :
 /**
  * Styles the header image and text displayed on the blog.
  *
@@ -45,7 +45,7 @@ 
 	 * If no custom options for text are set, let's bail.
 	 * get_header_textcolor() options: Any hex value, 'blank' to hide text. Default: HEADER_TEXTCOLOR.
 	 */
-	if ( HEADER_TEXTCOLOR === $header_text_color ) {
+	if (HEADER_TEXTCOLOR === $header_text_color) {
 		return;
 	}
 
@@ -54,7 +54,7 @@ 
 	<style type="text/css">
 	<?php
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+		if ( ! display_header_text()) :
 	?>
 		.site-title,
 		.site-description {
@@ -67,7 +67,7 @@ 
 	?>
 		.site-title a,
 		.site-description {
-			color: #<?php echo esc_attr( $header_text_color ); ?>;
+			color: #<?php echo esc_attr($header_text_color); ?>;
 		}
 	<?php endif; ?>
 	</style>

Braces +5 added lines, -2 removed lines

@@ -63,11 +63,14 @@
 		}
 	<?php
 		// If the user has set a custom color for the text use that.
-		else :
+		else {
+			:
 	?>
 		.site-title a,
 		.site-description {
-			color: #<?php echo esc_attr( $header_text_color ); ?>;
+			color: #<?php echo esc_attr( $header_text_color );
+		}
+		?>;
 		}
 	<?php endif; ?>
 	</style>

footer.php

Spacing +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 	<div class="footer-normal">
 		<div class="container">
 			<div class="row widget">
-				<div class="col-sm-6 col-md-3 widget-col widget-col-1"><?php dynamic_sidebar( 'footer_widgets_1' ); ?></div>
-				<div class="col-sm-6 col-md-3 widget-col widget-col-2"><?php dynamic_sidebar( 'footer_widgets_2' ); ?></div>
-				<div class="col-sm-6 col-md-3 widget-col widget-col-3"><?php dynamic_sidebar( 'footer_widgets_3' ); ?></div>
-				<div class="col-sm-6 col-md-3 widget-col widget-col-4"><?php dynamic_sidebar( 'footer_widgets_4' ); ?></div>
+				<div class="col-sm-6 col-md-3 widget-col widget-col-1"><?php dynamic_sidebar('footer_widgets_1'); ?></div>
+				<div class="col-sm-6 col-md-3 widget-col widget-col-2"><?php dynamic_sidebar('footer_widgets_2'); ?></div>
+				<div class="col-sm-6 col-md-3 widget-col widget-col-3"><?php dynamic_sidebar('footer_widgets_3'); ?></div>
+				<div class="col-sm-6 col-md-3 widget-col widget-col-4"><?php dynamic_sidebar('footer_widgets_4'); ?></div>
 			</div>
 		</div>
 	</div>

page-template/page-vc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 <div class="container">
   <div class="row">
     <main id="main" class="site-main" role="main">
-      <?php while ( have_posts() ) : the_post(); ?>
+      <?php while (have_posts()) : the_post(); ?>
         <section class="home-content">
           <?php the_content(); ?>
         </section>

page.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
 		<div class="row">
 			<main id="main" class="site-main" role="main">
 				<?php
-				while ( have_posts() ) : the_post();
+				while (have_posts()) : the_post();
 
-					get_template_part( 'template-parts/content', 'page' );
+					get_template_part('template-parts/content', 'page');
 
 					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) :
+					if (comments_open() || get_comments_number()) :
 						comments_template();
 					endif;
 

single.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 							<?php
 							 $postslist = get_posts('numberposts=99&order=DESC&orderby=date');
 							 foreach ($postslist as $post) :
-							    setup_postdata($post);
+								setup_postdata($post);
 							 ?>
 							 <div class="col-xs-12">
 							 <div class="entry">

Spacing +5 added lines, -5 removed lines

@@ -25,9 +25,9 @@ 
 				<main id="main" class="site-main" role="main">
 
 				<?php
-				while ( have_posts() ) : the_post();
+				while (have_posts()) : the_post();
 
-					$thumb_feature = wp_get_attachment_image_src( get_post_thumbnail_id(), 'lighthouse_feature_img');
+					$thumb_feature = wp_get_attachment_image_src(get_post_thumbnail_id(), 'lighthouse_feature_img');
 					$url_feature = $thumb_feature[0];
 				?> 
 
@@ -36,7 +36,7 @@ 
 				</div>
 
 				<?php
-				get_template_part( 'template-parts/content', get_post_format() );
+				get_template_part('template-parts/content', get_post_format());
 
 					//the_post_navigation();
 
@@ -65,7 +65,7 @@ 
 
 								<div class="thumbnail thumbnail-hover">
 								<?php
-									$thumb_post = wp_get_attachment_image_src( get_post_thumbnail_id(), 'lighthouse_related_post');
+									$thumb_post = wp_get_attachment_image_src(get_post_thumbnail_id(), 'lighthouse_related_post');
 									$url_post = $thumb_post[0];
 								?>
 									<img class="img-responsive" src="<?php echo $url_post; ?>">
@@ -87,7 +87,7 @@ 
 
 			</div><!-- .blog-listing -->
 		<div class="col-md-3 sidebar" role="complementary">
-			<?php dynamic_sidebar( 'blog_widgets' ); ?>
+			<?php dynamic_sidebar('blog_widgets'); ?>
 		</div>
 		</div><!-- .row -->
 	</div><!-- #primary -->

template-parts/content-search.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<?php the_title( sprintf( '<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h3>' ); ?>
+		<?php the_title(sprintf('<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url(get_permalink())), '</a></h3>'); ?>
 
-		<?php if ( 'post' === get_post_type() ) : ?>
+		<?php if ('post' === get_post_type()) : ?>
 		<div class="entry-meta">
 			<?php lighthouse_posted_on(); ?>
 		</div><!-- .entry-meta -->

search.php

Spacing +10 added lines, -10 removed lines

@@ -22,15 +22,15 @@ 
 			<div class="col-md-9 content-listing">
 				<main id="main" class="site-main search-results" role="main">
 
-				<?php query_posts($query_string . '&showposts=99');
-				if ( have_posts() ) : ?>
+				<?php query_posts($query_string.'&showposts=99');
+				if (have_posts()) : ?>
 
 					<header class="page-header">
 						<div class="search-inner-page">
-							<form role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+							<form role="search" method="get" action="<?php echo esc_url(home_url('/')); ?>">
 							    <div class="search-wrap">
-							    	<label class="screen-reader-text" for="s"><?php _e( 'Search for:', 'presentation' ); ?></label>
-							        <input type="search" placeholder="<?php echo esc_attr( 'Search', 'presentation' ); ?>" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" autocomplete="off"/>
+							    	<label class="screen-reader-text" for="s"><?php _e('Search for:', 'presentation'); ?></label>
+							        <input type="search" placeholder="<?php echo esc_attr('Search', 'presentation'); ?>" name="s" value="<?php echo esc_attr(get_search_query()); ?>" autocomplete="off"/>
 							         <button type="submit">
 						                Search
 						            </button>
@@ -38,20 +38,20 @@ 
 							</form>
 						</div>
 
-						<h1 class="page-title"><?php printf( esc_html__( 'Search Results for: %s', 'lighthouse' ), '<span>“' . get_search_query() . '”</span>' ); ?></h1>
+						<h1 class="page-title"><?php printf(esc_html__('Search Results for: %s', 'lighthouse'), '<span>“'.get_search_query().'”</span>'); ?></h1>
 
 					</header><!-- .page-header -->
 
 					<?php
 					/* Start the Loop */
-					while ( have_posts() ) : the_post();
+					while (have_posts()) : the_post();
 
 						/**
 						 * Run the loop for the search to output the results.
 						 * If you want to overload this in a child theme then include a file
 						 * called content-search.php and that will be used instead.
 						 */
-						get_template_part( 'template-parts/content', 'search' );
+						get_template_part('template-parts/content', 'search');
 
 					endwhile;
 
@@ -59,7 +59,7 @@ 
 
 				else :
 
-					get_template_part( 'template-parts/content', 'none' );
+					get_template_part('template-parts/content', 'none');
 
 				endif; ?>
 				</main><!-- #main -->
@@ -69,7 +69,7 @@ 
 				</div>
 			</div><!-- .blog-listing -->
 		<div class="col-md-3 sidebar" role="complementary">
-			<?php dynamic_sidebar( 'blog_widgets' ); ?>
+			<?php dynamic_sidebar('blog_widgets'); ?>
 		</div>
 		</div><!-- .row -->
 	</div><!-- #primary -->

Braces +3 added lines, -1 removed lines

@@ -57,9 +57,11 @@
 
 					the_posts_navigation();
 
-				else :
+				else {
+					:
 
 					get_template_part( 'template-parts/content', 'none' );
+				}
 
 				endif; ?>
 				</main><!-- #main -->

includes/acf/api/api-field.php

Doc Comments +3 added lines

@@ -679,6 +679,9 @@
 *  @return	$fields (array)
 */
 
+/**
+ * @return boolean
+ */
 function acf_get_fields_by_id( $id = 0 ) {
 	
 	// vars

Indentation +35 added lines, -35 removed lines

@@ -1209,69 +1209,69 @@
 	$data = maybe_serialize( $data );
     
     
-    // save
-    $save = array(
-    	'ID'			=> $extract['ID'],
-    	'post_status'	=> 'publish',
-    	'post_type'		=> 'acf-field',
-    	'post_title'	=> $extract['label'],
-    	'post_name'		=> $extract['key'],
-    	'post_excerpt'	=> $extract['name'],
-    	'post_content'	=> $data,
-    	'post_parent'	=> $extract['parent'],
-    	'menu_order'	=> $extract['menu_order'],
-    );
+	// save
+	$save = array(
+		'ID'			=> $extract['ID'],
+		'post_status'	=> 'publish',
+		'post_type'		=> 'acf-field',
+		'post_title'	=> $extract['label'],
+		'post_name'		=> $extract['key'],
+		'post_excerpt'	=> $extract['name'],
+		'post_content'	=> $data,
+		'post_parent'	=> $extract['parent'],
+		'menu_order'	=> $extract['menu_order'],
+	);
     
     
-    // $specific
-    if( !empty($specific) ) {
+	// $specific
+	if( !empty($specific) ) {
 	    
-	    // prepend ID
-    	array_unshift( $specific, 'ID' );
+		// prepend ID
+		array_unshift( $specific, 'ID' );
     	
     	
-	    // vars
-	    $_save = $save;
+		// vars
+		$_save = $save;
 	    
 	    
-	    // reset
-	    $save = array();
+		// reset
+		$save = array();
 	    
     	
-    	// appen data
-    	foreach( $specific as $key ) {
+		// appen data
+		foreach( $specific as $key ) {
 	    	
-	    	$save[ $key ] = $_save[ $key ];
+			$save[ $key ] = $_save[ $key ];
 	    	
-    	}
+		}
     	
-    }
+	}
     
     
-    // allow fields to contain the same name
+	// allow fields to contain the same name
 	add_filter( 'wp_unique_post_slug', 'acf_update_field_wp_unique_post_slug', 100, 6 ); 
 	
 	
-    // update the field and update the ID
-    if( $field['ID'] ) {
+	// update the field and update the ID
+	if( $field['ID'] ) {
 	    
-	    wp_update_post( $save );
+		wp_update_post( $save );
 	    
-    } else  {
+	} else  {
 	    
-	    $field['ID'] = wp_insert_post( $save );
+		$field['ID'] = wp_insert_post( $save );
 	    
-    }
+	}
 	
     
-    // clear cache
+	// clear cache
 	wp_cache_delete( "get_field/ID={$field['ID']}", 'acf' );
 	wp_cache_delete( "get_field/key={$field['key']}", 'acf' );
 	wp_cache_delete( "get_fields/parent={$field['parent']}", 'acf' );
 	
 	
-    // return
-    return $field;
+	// return
+	return $field;
 	
 }
 

Spacing +245 added lines, -245 removed lines

@@ -33,18 +33,18 @@ 
 *  @return	(array)
 */
 
-function acf_get_field_type_label( $field_type ) {
+function acf_get_field_type_label($field_type) {
 
 	// vars
 	$field_types = acf_get_field_types();
 	
 	
 	// loop through categories
-	foreach( $field_types as $category ) {
+	foreach ($field_types as $category) {
 		
-		if( isset( $category[ $field_type ] ) ) {
+		if (isset($category[$field_type])) {
 		
-			return $category[ $field_type ];
+			return $category[$field_type];
 			
 		}
 		
@@ -70,14 +70,14 @@ 
 *  @return	(boolean)
 */
 
-function acf_field_type_exists( $field_type ) {
+function acf_field_type_exists($field_type) {
 
 	// vars
-	$label = acf_get_field_type_label( $field_type );
+	$label = acf_get_field_type_label($field_type);
 	
 	
 	// return true if label exists
-	if( $label !== '' ) return true;
+	if ($label !== '') return true;
 		
 	
 	// return
@@ -99,22 +99,22 @@ 
 *  @return	(boolean)
 */
 
-function acf_is_field_key( $key = '' ) {
+function acf_is_field_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;
 	
 	
 	// default - starts with 'field_'
-	if( substr($key, 0, 6) === 'field_' ) return true;
+	if (substr($key, 0, 6) === 'field_') return true;
 	
 	
 	// special - allow local field key to be any string
-	if( acf_is_local_field($key) ) return true;
+	if (acf_is_local_field($key)) return true;
 	
 	
 	// return
@@ -136,14 +136,14 @@ 
 *  @return	$field (array)
 */
 
-function acf_get_valid_field( $field = false ) {
+function acf_get_valid_field($field = false) {
 	
 	// $field must be an array
-	if( !is_array($field) ) $field = array();
+	if ( ! is_array($field)) $field = array();
 	
 	
 	// bail ealry if already valid
-	if( !empty($field['_valid']) ) return $field;
+	if ( ! empty($field['_valid'])) return $field;
 	
 	
 	// defaults
@@ -178,12 +178,12 @@ 
 	
 	
 	// translate
-	acf_translate_keys( $field, acf_get_setting('l10n_field') );
+	acf_translate_keys($field, acf_get_setting('l10n_field'));
 	
 	
 	// field specific defaults
-	$field = apply_filters( "acf/get_valid_field", $field );
-	$field = apply_filters( "acf/get_valid_field/type={$field['type']}", $field );
+	$field = apply_filters("acf/get_valid_field", $field);
+	$field = apply_filters("acf/get_valid_field/type={$field['type']}", $field);
 	
 	
 	// field is now valid
@@ -208,10 +208,10 @@ 
 *  @return	$field (array)
 */
 
-function acf_prepare_field( $field ) {
+function acf_prepare_field($field) {
 	
 	// bail early if already prepared
-	if( $field['_input'] ) return $field;
+	if ($field['_input']) return $field;
 	
 	
 	// _input
@@ -219,7 +219,7 @@ 
 	
 
 	// _input: key overrides name
-	if( $field['key'] ) {
+	if ($field['key']) {
 		
 		$field['_input'] = $field['key'];
 		
@@ -227,7 +227,7 @@ 
 
 	
 	// _input: prefix prepends name
-	if( $field['prefix'] ) {
+	if ($field['prefix']) {
 		
 		$field['_input'] = "{$field['prefix']}[{$field['_input']}]";
 		
@@ -235,7 +235,7 @@ 
 	
 	
 	// add id (may be custom set)
-	if( !$field['id'] ) {
+	if ( ! $field['id']) {
 		
 		$field['id'] = str_replace(array('][', '[', ']'), array('-', '-', ''), $field['_input']);
 		
@@ -243,10 +243,10 @@ 
 	
 	
 	// filter to 3rd party customization
-	$field = apply_filters( "acf/prepare_field", $field );
-	$field = apply_filters( "acf/prepare_field/type={$field['type']}", $field );
-	$field = apply_filters( "acf/prepare_field/name={$field['name']}", $field );
-	$field = apply_filters( "acf/prepare_field/key={$field['key']}", $field );
+	$field = apply_filters("acf/prepare_field", $field);
+	$field = apply_filters("acf/prepare_field/type={$field['type']}", $field);
+	$field = apply_filters("acf/prepare_field/name={$field['name']}", $field);
+	$field = apply_filters("acf/prepare_field/key={$field['key']}", $field);
 	
 	
 	// return
@@ -268,14 +268,14 @@ 
 *  @return	(boolean)
 */
 
-function acf_is_sub_field( $field ) {
+function acf_is_sub_field($field) {
 	
 	// local field uses a field instead of ID
-	if( acf_is_field_key($field['parent']) ) return true;
+	if (acf_is_field_key($field['parent'])) return true;
 	
 	
 	// attempt to load parent field
-	if( acf_get_field($field['parent']) ) return true;
+	if (acf_get_field($field['parent'])) return true;
 	
 	
 	// return
@@ -297,13 +297,13 @@ 
 *  @return	$label (string)
 */
 
-function acf_get_field_label( $field ) {
+function acf_get_field_label($field) {
 	
 	// vars
 	$label = $field['label'];
 	
 	
-	if( $field['required'] ) {
+	if ($field['required']) {
 		
 		$label .= ' <span class="acf-required">*</span>';
 		
@@ -315,9 +315,9 @@ 
 
 }
 
-function acf_the_field_label( $field ) {
+function acf_the_field_label($field) {
 	
-	echo acf_get_field_label( $field );
+	echo acf_get_field_label($field);
 	
 }
 
@@ -339,10 +339,10 @@ 
 *  @return	n/a
 */
 
-function acf_render_fields( $post_id = 0, $fields, $el = 'div', $instruction = 'label' ) {
+function acf_render_fields($post_id = 0, $fields, $el = 'div', $instruction = 'label') {
 	
 	// bail early if no fields
-	if( empty($fields) ) return false;
+	if (empty($fields)) return false;
 	
 		
 	// remove corrupt fields
@@ -350,12 +350,12 @@ 
 	
 	
 	// loop through fields
-	foreach( $fields as $field ) {
+	foreach ($fields as $field) {
 		
 		// load value
-		if( $field['value'] === null ) {
+		if ($field['value'] === null) {
 			
-			$field['value'] = acf_get_value( $post_id, $field );
+			$field['value'] = acf_get_value($post_id, $field);
 			
 		} 
 		
@@ -365,7 +365,7 @@ 
 		
 		
 		// render
-		acf_render_field_wrap( $field, $el, $instruction );
+		acf_render_field_wrap($field, $el, $instruction);
 		
 	}
 	
@@ -385,14 +385,14 @@ 
 *  @return	n/a
 */
 
-function acf_render_field( $field = false ) {
+function acf_render_field($field = false) {
 	
 	// get valid field
-	$field = acf_get_valid_field( $field );
+	$field = acf_get_valid_field($field);
 	
 	
 	// prepare field for input
-	$field = acf_prepare_field( $field );
+	$field = acf_prepare_field($field);
 	
 	
 	// update $field['name']
@@ -400,8 +400,8 @@ 
 		
 	
 	// create field specific html
-	do_action( "acf/render_field", $field );
-	do_action( "acf/render_field/type={$field['type']}", $field );
+	do_action("acf/render_field", $field);
+	do_action("acf/render_field/type={$field['type']}", $field);
 	
 }
 
@@ -422,14 +422,14 @@ 
 *  @return	N/A
 */
 
-function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) {
+function acf_render_field_wrap($field, $el = 'div', $instruction = 'label') {
 	
 	// get valid field
-	$field = acf_get_valid_field( $field );
+	$field = acf_get_valid_field($field);
 	
 	
 	// prepare field for input
-	$field = acf_prepare_field( $field );
+	$field = acf_prepare_field($field);
 	
 	
 	// el
@@ -444,7 +444,7 @@ 
 	
 	
 	// validate $el
-	if( !array_key_exists($el, $elements) ) {
+	if ( ! array_key_exists($el, $elements)) {
 		
 		$el = 'div';
 	
@@ -464,7 +464,7 @@ 
 	
 	
 	// add required
-	if( $field['required'] ) {
+	if ($field['required']) {
 		
 		$wrapper['data-required'] = 1;
 		
@@ -476,7 +476,7 @@ 
 	
 	
 	// add key
-	if( $field['key'] ) {
+	if ($field['key']) {
 		
 		$wrapper['class'] .= " acf-field-{$field['key']}";
 		$wrapper['data-key'] = $field['key'];
@@ -490,11 +490,11 @@ 
 	
 	
 	// wrap classes have changed (5.2.7)
-	if( acf_get_compatibility('field_wrapper_class') ) {
+	if (acf_get_compatibility('field_wrapper_class')) {
 		
 		$wrapper['class'] .= " field_type-{$field['type']}";
 		
-		if( $field['key'] ) {
+		if ($field['key']) {
 			
 			$wrapper['class'] .= " field_key-{$field['key']}";
 			
@@ -504,17 +504,17 @@ 
 	
 	
 	// merge in atts
-	$wrapper = acf_merge_atts( $wrapper, $field['wrapper'] );
+	$wrapper = acf_merge_atts($wrapper, $field['wrapper']);
 	
 	
 	// add width
-	$width = (int) acf_extract_var( $wrapper, 'width' );
+	$width = (int) acf_extract_var($wrapper, 'width');
 	
-	if( $el == 'tr' || $el == 'td' ) {
+	if ($el == 'tr' || $el == 'td') {
 		
 		$width = 0;
 		
-	} elseif( $width > 0 && $width < 100 ) {
+	} elseif ($width > 0 && $width < 100) {
 		
 		$wrapper['data-width'] = $width;
 		$wrapper['style'] .= " width:{$width}%;";
@@ -523,9 +523,9 @@ 
 	
 	
 	// remove empty attributes
-	foreach( $wrapper as $k => $v ) {
+	foreach ($wrapper as $k => $v) {
 		
-		if( $v == '' ) {
+		if ($v == '') {
 			
 			unset($wrapper[$k]);
 			
@@ -537,7 +537,7 @@ 
 	// vars
 	$show_label = true;
 	
-	if( $el == 'td' ) {
+	if ($el == 'td') {
 		
 		$show_label = false;
 		
@@ -545,22 +545,22 @@ 
 	
 	
 ?><<?php echo $el; ?> <?php echo acf_esc_attr($wrapper); ?>>
-<?php if( $show_label ): ?>
-	<<?php echo $elements[ $el ]; ?> class="acf-label">
+<?php if ($show_label): ?>
+	<<?php echo $elements[$el]; ?> class="acf-label">
 		<label for="<?php echo $field['id']; ?>"><?php echo acf_get_field_label($field); ?></label>
-<?php if( $instruction == 'label' && $field['instructions'] ): ?>
+<?php if ($instruction == 'label' && $field['instructions']): ?>
 		<p class="description"><?php echo $field['instructions']; ?></p>
 <?php endif; ?>
-	</<?php echo $elements[ $el ]; ?>>
+	</<?php echo $elements[$el]; ?>>
 <?php endif; ?>
-	<<?php echo $elements[ $el ]; ?> class="acf-input">
-		<?php acf_render_field( $field ); ?>
+	<<?php echo $elements[$el]; ?> class="acf-input">
+		<?php acf_render_field($field); ?>
 		
-<?php if( $instruction == 'field' && $field['instructions'] ): ?>
+<?php if ($instruction == 'field' && $field['instructions']): ?>
 		<p class="description"><?php echo $field['instructions']; ?></p>
 <?php endif; ?>
-	</<?php echo $elements[ $el ]; ?>>
-<?php if( !empty($field['conditional_logic'])): ?>
+	</<?php echo $elements[$el]; ?>>
+<?php if ( ! empty($field['conditional_logic'])): ?>
 	<script type="text/javascript">
 		if(typeof acf !== 'undefined'){ acf.conditional_logic.add( '<?php echo $field['key']; ?>', <?php echo json_encode($field['conditional_logic']); ?>); }
 	</script>
@@ -585,14 +585,14 @@ 
 *  @return	n/a
 */
 
-function acf_render_field_setting( $field, $setting, $global = false ) {
+function acf_render_field_setting($field, $setting, $global = false) {
 	
 	// validate
-	$setting = acf_get_valid_field( $setting );
+	$setting = acf_get_valid_field($setting);
 	
 	
 	// if this setting is not global, add a data attribute
-	if( !$global ) {
+	if ( ! $global) {
 		
 		$setting['wrapper']['data-setting'] = $field['type'];
 		
@@ -604,15 +604,15 @@ 
 		
 		
 	// copy across the $setting value
-	if( isset($field[ $setting['name'] ]) ) {
+	if (isset($field[$setting['name']])) {
 		
-		$setting['value'] = $field[ $setting['name'] ];
+		$setting['value'] = $field[$setting['name']];
 		
 	}
 	
 	
 	// render
-	acf_render_field_wrap( $setting, 'tr', 'label' );
+	acf_render_field_wrap($setting, 'tr', 'label');
 	
 }
 
@@ -630,18 +630,18 @@ 
 *  @return	(array)
 */
 
-function acf_get_fields( $parent = false ) {
+function acf_get_fields($parent = false) {
 	
 	// allow $parent to be a field group ID
-	if( !is_array($parent) ) {
+	if ( ! is_array($parent)) {
 		
-		$parent = acf_get_field_group( $parent );
+		$parent = acf_get_field_group($parent);
 	
 	}
 	
 	
 	// bail early if no parent
-	if( !$parent ) return false;
+	if ( ! $parent) return false;
 	
 	
 	// vars
@@ -649,13 +649,13 @@ 
 	
 	
 	// try JSON before DB to save query time
-	if( acf_have_local_fields( $parent['key'] ) ) {
+	if (acf_have_local_fields($parent['key'])) {
 		
-		$fields = acf_get_local_fields( $parent['key'] );
+		$fields = acf_get_local_fields($parent['key']);
 		
 	} else {
 		
-		$fields = acf_get_fields_by_id( $parent['ID'] );
+		$fields = acf_get_fields_by_id($parent['ID']);
 	
 	}
 	
@@ -679,21 +679,21 @@ 
 *  @return	$fields (array)
 */
 
-function acf_get_fields_by_id( $id = 0 ) {
+function acf_get_fields_by_id($id = 0) {
 	
 	// vars
 	$fields = array();
 	
 	
 	// bail early if no ID
-	if( empty($id) ) return false;
+	if (empty($id)) return false;
 	
 	
 	// cache
 	$found = false;
-	$cache = wp_cache_get( 'get_fields/parent=' . $id, 'acf', false, $found );
+	$cache = wp_cache_get('get_fields/parent='.$id, 'acf', false, $found);
 	
-	if( $found ) return $cache;
+	if ($found) return $cache;
 	
 	
 	// args
@@ -710,13 +710,13 @@ 
 		
 	
 	// load fields
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 	
-	if( $posts ) {
+	if ($posts) {
 		
-		foreach( $posts as $post ) {
+		foreach ($posts as $post) {
 			
-			$fields[] = acf_get_field( $post->ID );
+			$fields[] = acf_get_field($post->ID);
 			
 		}
 			
@@ -724,7 +724,7 @@ 
 	
 	
 	// set cache
-	wp_cache_set( 'get_fields/parent=' . $id, $fields, 'acf' );
+	wp_cache_set('get_fields/parent='.$id, $fields, 'acf');
 		
 	
 	// return
@@ -747,7 +747,7 @@ 
 *  @return	$field (array)
 */
 
-function acf_get_field( $selector = null, $db_only = false ) {
+function acf_get_field($selector = null, $db_only = false) {
 	
 	// vars
 	$field = false;
@@ -755,17 +755,17 @@ 
 	
 	
 	// is $selector an ID
-	if( is_numeric($selector) ) {
+	if (is_numeric($selector)) {
 		
 		// do nothing
 	
 	// is $selector a string (name|key)	
-	} elseif( is_string($selector) ) {
+	} elseif (is_string($selector)) {
 		
 		$type = acf_is_field_key($selector) ? 'key' : 'name';
 	
 	// is $selector an object
-	} elseif( is_object($selector) ) {
+	} elseif (is_object($selector)) {
 		
 		$selector = $selector->ID;
 	
@@ -782,34 +782,34 @@ 
 	
 	
 	// get cache
-	if( !$db_only ) {
+	if ( ! $db_only) {
 		
 		$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( $type == 'ID' ) {
+	if ($type == 'ID') {
 		
-		$field = _acf_get_field_by_id( $selector, $db_only );
+		$field = _acf_get_field_by_id($selector, $db_only);
 		
-	} elseif( $type == 'name' ) {
+	} elseif ($type == 'name') {
 		
-		$field = _acf_get_field_by_name( $selector, $db_only );
+		$field = _acf_get_field_by_name($selector, $db_only);
 		
 	} else {
 		
-		$field = _acf_get_field_by_key( $selector, $db_only );
+		$field = _acf_get_field_by_key($selector, $db_only);
 		
 	}
 	
 	
 	// bail early if db only value (no need to update cache)
-	if( $db_only ) {
+	if ($db_only) {
 		
 		return $field;
 		
@@ -817,18 +817,18 @@ 
 	
 	
 	// filter for 3rd party customization
-	if( $field ) {
+	if ($field) {
 		
-		$field = apply_filters( "acf/load_field", $field);
-		$field = apply_filters( "acf/load_field/type={$field['type']}", $field );
-		$field = apply_filters( "acf/load_field/name={$field['name']}", $field );
-		$field = apply_filters( "acf/load_field/key={$field['key']}", $field );
+		$field = apply_filters("acf/load_field", $field);
+		$field = apply_filters("acf/load_field/type={$field['type']}", $field);
+		$field = apply_filters("acf/load_field/name={$field['name']}", $field);
+		$field = apply_filters("acf/load_field/key={$field['key']}", $field);
 		
 	}
 	
 	
 	// set cache
-	wp_cache_set( $cache_key, $field, 'acf' );
+	wp_cache_set($cache_key, $field, 'acf');
 
 	
 	// return
@@ -850,14 +850,14 @@ 
 *  @return	$field (array)
 */
 
-function _acf_get_field_by_id( $post_id = 0, $db_only = false ) {
+function _acf_get_field_by_id($post_id = 0, $db_only = false) {
 	
 	// get post
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	
 	
 	// bail early if no post, or is not a field
-	if( empty($post) || $post->post_type != 'acf-field' ) {
+	if (empty($post) || $post->post_type != 'acf-field') {
 	
 		return false;
 		
@@ -865,7 +865,7 @@ 
 	
 	
 	// unserialize
-	$field = maybe_unserialize( $post->post_content );
+	$field = maybe_unserialize($post->post_content);
 	
 	
 	// update attributes
@@ -878,7 +878,7 @@ 
 
 
 	// override with JSON
-	if( !$db_only && acf_is_local_field($field['key']) ) {
+	if ( ! $db_only && acf_is_local_field($field['key'])) {
 		
 		// extract some args
 		$backup = acf_extract_vars($field, array(
@@ -888,7 +888,7 @@ 
 		
 
 		// load JSON field
-		$field = acf_get_local_field( $field['key'] );
+		$field = acf_get_local_field($field['key']);
 		
 		
 		// merge in backup
@@ -898,7 +898,7 @@ 
 	
 	
 	// validate
-	$field = acf_get_valid_field( $field );
+	$field = acf_get_valid_field($field);
 	
 	
 	// return
@@ -920,15 +920,15 @@ 
 *  @return	$field (array)
 */
 
-function _acf_get_field_by_key( $key = '', $db_only = false ) {
+function _acf_get_field_by_key($key = '', $db_only = false) {
 	
 	// try JSON before DB to save query time
-	if( !$db_only && acf_is_local_field( $key ) ) {
+	if ( ! $db_only && acf_is_local_field($key)) {
 		
-		$field = acf_get_local_field( $key );
+		$field = acf_get_local_field($key);
 		
 		// validate
-		$field = acf_get_valid_field( $field );
+		$field = acf_get_valid_field($field);
 	
 		// return
 		return $field;
@@ -937,15 +937,15 @@ 
 	
 	
 	// vars
-	$post_id = acf_get_field_id( $key );
+	$post_id = acf_get_field_id($key);
 	
 	
 	// bail early if no post_id
-	if( !$post_id ) return false;
+	if ( ! $post_id) return false;
 		
 	
 	// return
-	return _acf_get_field_by_id( $post_id, $db_only );
+	return _acf_get_field_by_id($post_id, $db_only);
 	
 }
 
@@ -963,7 +963,7 @@ 
 *  @return	$field (array)
 */
 
-function _acf_get_field_by_name( $name = '', $db_only = false ) {
+function _acf_get_field_by_name($name = '', $db_only = false) {
 	
 	// vars
 	$args = array(
@@ -977,15 +977,15 @@ 
 	
 	
 	// load posts
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 	
 	
 	// bail early if no posts
-	if( empty($posts) ) return false;
+	if (empty($posts)) return false;
 	
 	
 	// return
-	return _acf_get_field_by_id( $posts[0]->ID, $db_only );
+	return _acf_get_field_by_id($posts[0]->ID, $db_only);
 	
 }
 
@@ -1006,7 +1006,7 @@ 
 *  @return	$field (array)
 */
 
-function acf_maybe_get_field( $selector, $post_id = false, $strict = true ) {
+function acf_maybe_get_field($selector, $post_id = false, $strict = true) {
 	
 	// complete init
 	// this function may be used in a theme file before the init action has been run
@@ -1018,25 +1018,25 @@ 
 	
 	
 	// get valid post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// load field reference if not a field_key
-	if( !acf_is_field_key($selector) ) {
+	if ( ! acf_is_field_key($selector)) {
 		
 		// save selector as field_name (could be sub field name)
 		$field_name = $selector;
 			
 			
 		// get reference
-		$field_key = acf_get_field_reference( $selector, $post_id );
+		$field_key = acf_get_field_reference($selector, $post_id);
 		
 		
-		if( $field_key ) {
+		if ($field_key) {
 			
 			$selector = $field_key;
 			
-		} elseif( $strict ) {
+		} elseif ($strict) {
 			
 			return false;
 			
@@ -1046,15 +1046,15 @@ 
 	
 	
 	// get field key
-	$field = acf_get_field( $selector );
+	$field = acf_get_field($selector);
 	
 	
 	// bail early if no field
-	if( !$field ) return false;
+	if ( ! $field) return false;
 	
 	
 	// Override name - allows the $selector to be a sub field (images_0_image)
-	if( $field_name ) {
+	if ($field_name) {
 	
 		$field['name'] = $field_name;	
 		
@@ -1081,7 +1081,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_field_id( $key = '' ) {
+function acf_get_field_id($key = '') {
 	
 	// vars
 	$args = array(
@@ -1095,11 +1095,11 @@ 
 	
 	
 	// load posts
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 	
 	
 	// validate
-	if( empty($posts) ) return 0;
+	if (empty($posts)) return 0;
 	
 	
 	// return
@@ -1122,25 +1122,25 @@ 
 *  @return	$field (array)
 */
 
-function acf_update_field( $field = false, $specific = false ) {
+function acf_update_field($field = false, $specific = false) {
 	
 	// $field must be an array
-	if( !is_array($field) ) return false;
+	if ( ! is_array($field)) return false;
 	
 	
 	// validate
-	$field = acf_get_valid_field( $field );
+	$field = acf_get_valid_field($field);
 	
 	
 	// may have been posted. Remove slashes
-	$field = wp_unslash( $field );
+	$field = wp_unslash($field);
 	
 	
 	// clean up conditional logic keys
-	if( !empty($field['conditional_logic']) ) {
+	if ( ! empty($field['conditional_logic'])) {
 		
 		// extract groups
-		$groups = acf_extract_var( $field, 'conditional_logic' );
+		$groups = acf_extract_var($field, 'conditional_logic');
 		
 		
 		// clean array
@@ -1149,10 +1149,10 @@ 
 		
 		
 		// clean rules
-		foreach( array_keys($groups) as $i ) {
+		foreach (array_keys($groups) as $i) {
 			
-			$groups[ $i ] = array_filter($groups[ $i ]);
-			$groups[ $i ] = array_values($groups[ $i ]);
+			$groups[$i] = array_filter($groups[$i]);
+			$groups[$i] = array_values($groups[$i]);
 			
 		}
 		
@@ -1164,23 +1164,23 @@ 
 	
 	
 	// find correct parent
-	if( acf_is_field_key($field['parent']) ) {
+	if (acf_is_field_key($field['parent'])) {
 		
 		// get parent
-		$parent = acf_get_field( $field['parent'] );
+		$parent = acf_get_field($field['parent']);
 		
 
 		// update to ID
-		$field['parent'] = acf_maybe_get( $parent, 'ID', 0 );
+		$field['parent'] = acf_maybe_get($parent, 'ID', 0);
 		
 	}
 	
 	
 	// filter for 3rd party customization
-	$field = apply_filters( "acf/update_field", $field);
-	$field = apply_filters( "acf/update_field/type={$field['type']}", $field );
-	$field = apply_filters( "acf/update_field/name={$field['name']}", $field );
-	$field = apply_filters( "acf/update_field/key={$field['key']}", $field );
+	$field = apply_filters("acf/update_field", $field);
+	$field = apply_filters("acf/update_field/type={$field['type']}", $field);
+	$field = apply_filters("acf/update_field/name={$field['name']}", $field);
+	$field = apply_filters("acf/update_field/key={$field['key']}", $field);
 	
 	
 	// store origional field for return
@@ -1206,7 +1206,7 @@ 
 	
 	
 	// serialize for DB
-	$data = maybe_serialize( $data );
+	$data = maybe_serialize($data);
     
     
     // save
@@ -1224,10 +1224,10 @@ 
     
     
     // $specific
-    if( !empty($specific) ) {
+    if ( ! empty($specific)) {
 	    
 	    // prepend ID
-    	array_unshift( $specific, 'ID' );
+    	array_unshift($specific, 'ID');
     	
     	
 	    // vars
@@ -1239,9 +1239,9 @@ 
 	    
     	
     	// appen data
-    	foreach( $specific as $key ) {
+    	foreach ($specific as $key) {
 	    	
-	    	$save[ $key ] = $_save[ $key ];
+	    	$save[$key] = $_save[$key];
 	    	
     	}
     	
@@ -1249,25 +1249,25 @@ 
     
     
     // allow fields to contain the same name
-	add_filter( 'wp_unique_post_slug', 'acf_update_field_wp_unique_post_slug', 100, 6 ); 
+	add_filter('wp_unique_post_slug', 'acf_update_field_wp_unique_post_slug', 100, 6); 
 	
 	
     // update the field and update the ID
-    if( $field['ID'] ) {
+    if ($field['ID']) {
 	    
-	    wp_update_post( $save );
+	    wp_update_post($save);
 	    
-    } else  {
+    } else {
 	    
-	    $field['ID'] = wp_insert_post( $save );
+	    $field['ID'] = wp_insert_post($save);
 	    
     }
 	
     
     // clear cache
-	wp_cache_delete( "get_field/ID={$field['ID']}", 'acf' );
-	wp_cache_delete( "get_field/key={$field['key']}", 'acf' );
-	wp_cache_delete( "get_fields/parent={$field['parent']}", 'acf' );
+	wp_cache_delete("get_field/ID={$field['ID']}", 'acf');
+	wp_cache_delete("get_field/key={$field['key']}", 'acf');
+	wp_cache_delete("get_fields/parent={$field['parent']}", 'acf');
 	
 	
     // return
@@ -1275,9 +1275,9 @@ 
 	
 }
 
-function acf_update_field_wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
+function acf_update_field_wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug) {
 		
-	if( $post_type == 'acf-field' ) {
+	if ($post_type == 'acf-field') {
 	
 		$slug = $original_slug;
 	
@@ -1303,28 +1303,28 @@ 
 *  @return	n/a
 */
 
-function acf_duplicate_fields( $fields, $new_parent = 0 ) {
+function acf_duplicate_fields($fields, $new_parent = 0) {
 	
 	// bail early if no fields
-	if( empty($fields) ) return;
+	if (empty($fields)) return;
 	
 	
 	// create new field keys (for conditional logic fixes)
-	foreach( $fields as $field ) {
+	foreach ($fields as $field) {
 		
 		// ensure a delay for unique ID
 		usleep(1);
 		
-		acf_update_setting( 'duplicate_key_' . $field['key'] , uniqid('field_') );
+		acf_update_setting('duplicate_key_'.$field['key'], uniqid('field_'));
 		
 	}
 	
 	
 	// duplicate fields
-	foreach( $fields as $field ) {
+	foreach ($fields as $field) {
 	
 		// duplicate
-		acf_duplicate_field( $field['ID'], $new_parent );
+		acf_duplicate_field($field['ID'], $new_parent);
 		
 	}
 	
@@ -1345,18 +1345,18 @@ 
 *  @return	$field (array) the new field
 */
 
-function acf_duplicate_field( $selector = 0, $new_parent = 0 ){
+function acf_duplicate_field($selector = 0, $new_parent = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field
-	$field = acf_get_field( $selector );
+	$field = acf_get_field($selector);
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) {
+	if (empty($field)) {
 	
 		return false;
 		
@@ -1368,11 +1368,11 @@ 
 	
 	
 	// try duplicate keys
-	$field['key'] = acf_get_setting( 'duplicate_key_' . $field['key'] );
+	$field['key'] = acf_get_setting('duplicate_key_'.$field['key']);
 	
 	
 	// default key
-	if( empty($field['key']) ) {
+	if (empty($field['key'])) {
 		
 		$field['key'] = uniqid('field_');
 			
@@ -1380,7 +1380,7 @@ 
 	
 	
 	// update parent
-	if( $new_parent ) {
+	if ($new_parent) {
 	
 		$field['parent'] = $new_parent;
 		
@@ -1388,21 +1388,21 @@ 
 	
 	
 	// update conditional logic references (because field keys have changed)
-	if( !empty($field['conditional_logic']) ) {
+	if ( ! empty($field['conditional_logic'])) {
 	
 		// extract groups
-		$groups = acf_extract_var( $field, 'conditional_logic' );
+		$groups = acf_extract_var($field, 'conditional_logic');
 		
 		
 		// loop over groups
-		foreach( array_keys($groups) as $g ) {
+		foreach (array_keys($groups) as $g) {
 			
 			// extract group
-			$group = acf_extract_var( $groups, $g );
+			$group = acf_extract_var($groups, $g);
 			
 			
 			// bail early if empty
-			if( empty($group) ) {
+			if (empty($group)) {
 				
 				continue;
 				
@@ -1410,18 +1410,18 @@ 
 			
 			
 			// loop over rules
-			foreach( array_keys($group) as $r ) {
+			foreach (array_keys($group) as $r) {
 				
 				// extract rule
-				$rule = acf_extract_var( $group, $r );
+				$rule = acf_extract_var($group, $r);
 				
 				
 				// vars
-				$new_key = acf_get_setting( 'duplicate_key_' . $rule['field'] );
+				$new_key = acf_get_setting('duplicate_key_'.$rule['field']);
 				
 				
 				// update rule with new key
-				if( $new_key ) {
+				if ($new_key) {
 					
 					$rule['field'] = $new_key;
 					
@@ -1429,13 +1429,13 @@ 
 				
 				
 				// append to group
-				$group[ $r ] = $rule;
+				$group[$r] = $rule;
 				
 			}
 			
 			
 			// append to groups
-			$groups[ $g ] = $group;
+			$groups[$g] = $group;
 			
 		}
 		
@@ -1448,12 +1448,12 @@ 
 	
 	
 	// filter for 3rd party customization
-	$field = apply_filters( "acf/duplicate_field", $field);
-	$field = apply_filters( "acf/duplicate_field/type={$field['type']}", $field );
+	$field = apply_filters("acf/duplicate_field", $field);
+	$field = apply_filters("acf/duplicate_field/type={$field['type']}", $field);
 	
 	
 	// save
-	return acf_update_field( $field );
+	return acf_update_field($field);
 	
 }
 
@@ -1471,33 +1471,33 @@ 
 *  @return	(boolean)
 */
 
-function acf_delete_field( $selector = 0 ) {
+function acf_delete_field($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field = acf_get_field( $selector );
+	$field = acf_get_field($selector);
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if (empty($field)) return false;
 	
 	
 	// delete field
-	wp_delete_post( $field['ID'], true );
+	wp_delete_post($field['ID'], true);
 	
 	
 	// action for 3rd party customisation
-	do_action( "acf/delete_field", $field);
-	do_action( "acf/delete_field/type={$field['type']}", $field );
+	do_action("acf/delete_field", $field);
+	do_action("acf/delete_field/type={$field['type']}", $field);
 	
 	
 	// clear cache
-	wp_cache_delete( "get_field/ID={$field['ID']}", 'acf' );
-	wp_cache_delete( "get_field/key={$field['key']}", 'acf' );
-	wp_cache_delete( "get_fields/parent={$field['parent']}", 'acf' );
+	wp_cache_delete("get_field/ID={$field['ID']}", 'acf');
+	wp_cache_delete("get_field/key={$field['key']}", 'acf');
+	wp_cache_delete("get_fields/parent={$field['parent']}", 'acf');
 	
 	
 	// return
@@ -1518,26 +1518,26 @@ 
 *  @return	(boolean)
 */
 
-function acf_trash_field( $selector = 0 ) {
+function acf_trash_field($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field = acf_get_field( $selector );
+	$field = acf_get_field($selector);
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if (empty($field)) return false;
 	
 	
 	// delete field
-	wp_trash_post( $field['ID'] );
+	wp_trash_post($field['ID']);
 	
 	
 	// action for 3rd party customisation
-	do_action( 'acf/trash_field', $field );
+	do_action('acf/trash_field', $field);
 	
 	
 	// return
@@ -1558,26 +1558,26 @@ 
 *  @return	(boolean)
 */
 
-function acf_untrash_field( $selector = 0 ) {
+function acf_untrash_field($selector = 0) {
 	
 	// disable JSON to avoid conflicts between DB and JSON
 	acf_disable_local();
 	
 	
 	// load the origional field gorup
-	$field = acf_get_field( $selector );
+	$field = acf_get_field($selector);
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if (empty($field)) return false;
 	
 	
 	// delete field
-	wp_untrash_post( $field['ID'] );
+	wp_untrash_post($field['ID']);
 	
 	
 	// action for 3rd party customisation
-	do_action( 'acf/untrash_field', $field );
+	do_action('acf/untrash_field', $field);
 	
 	
 	// return
@@ -1598,17 +1598,17 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_prepare_fields_for_export( $fields = false ) {
+function acf_prepare_fields_for_export($fields = false) {
 	
 	// validate
-	if( empty($fields) ) return $fields;
+	if (empty($fields)) return $fields;
 	
 	
 	// format
-	foreach( array_keys($fields) as $i ) {
+	foreach (array_keys($fields) as $i) {
 		
 		// prepare
-		$fields[ $i ] = acf_prepare_field_for_export( $fields[ $i ] );
+		$fields[$i] = acf_prepare_field_for_export($fields[$i]);
 				
 	}
 	
@@ -1632,7 +1632,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_prepare_field_for_export( $field ) {
+function acf_prepare_field_for_export($field) {
 	
 	// extract some args
 	$extract = acf_extract_vars($field, array(
@@ -1650,7 +1650,7 @@ 
 	
 	
 	// filter for 3rd party customization
-	$field = apply_filters( "acf/prepare_field_for_export", $field );
+	$field = apply_filters("acf/prepare_field_for_export", $field);
 	
 	
 	// return
@@ -1671,10 +1671,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_prepare_fields_for_import( $fields = false ) {
+function acf_prepare_fields_for_import($fields = false) {
 	
 	// validate
-	if( empty($fields) ) return $fields;
+	if (empty($fields)) return $fields;
 	
 	
 	// re-index array
@@ -1686,14 +1686,14 @@ 
 	
 	
 	// format
-	while( $i < count($fields) ) {
+	while ($i < count($fields)) {
 		
 		// prepare field
-		$field = acf_prepare_field_for_import( $fields[ $i ] );
+		$field = acf_prepare_field_for_import($fields[$i]);
 		
 		
 		// $field may be an array of multiple fields (including sub fields)
-		if( !isset($field['key']) ) {
+		if ( ! isset($field['key'])) {
 			
 			$extra = $field;
 			
@@ -1703,7 +1703,7 @@ 
 		}
 		
 		// prepare
-		$fields[ $i ] = $field;
+		$fields[$i] = $field;
 		
 		
 		// $i
@@ -1734,7 +1734,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_prepare_field_for_import( $field ) {
+function acf_prepare_field_for_import($field) {
 	
 	// extract some args
 	$extract = acf_extract_vars($field, array(
@@ -1748,7 +1748,7 @@ 
 	
 	
 	// filter for 3rd party customization
-	$field = apply_filters( "acf/prepare_field_for_import", $field );
+	$field = apply_filters("acf/prepare_field_for_import", $field);
 	
 	
 	// return
@@ -1770,19 +1770,19 @@ 
 *  @return	$field (array)
 */
 
-function acf_get_sub_field( $selector, $field ) {
+function acf_get_sub_field($selector, $field) {
 	
 	// sub fields
-	if( $field['type'] == 'repeater' ) {
+	if ($field['type'] == 'repeater') {
 		
 		// extract sub fields
-		$sub_fields = acf_extract_var( $field, 'sub_fields');
+		$sub_fields = acf_extract_var($field, 'sub_fields');
 		
-		if( !empty($sub_fields) ) {
+		if ( ! empty($sub_fields)) {
 		
-			foreach( $sub_fields as $sub_field ) {
+			foreach ($sub_fields as $sub_field) {
 				
-				if( $sub_field['name'] == $selector || $sub_field['key'] == $selector ) {
+				if ($sub_field['name'] == $selector || $sub_field['key'] == $selector) {
 					
 					// return
 					return $sub_field;
@@ -1796,19 +1796,19 @@ 
 		}
 		// if
 		
-	} elseif( $field['type'] == 'flexible_content' ) {
+	} elseif ($field['type'] == 'flexible_content') {
 		
 		// vars
-		$layouts = acf_extract_var( $field, 'layouts');
+		$layouts = acf_extract_var($field, 'layouts');
 		$current = get_row_layout();
 		
 		
-		if( !empty($layouts) ) {
+		if ( ! empty($layouts)) {
 			
-			foreach( $layouts as $layout ) {
+			foreach ($layouts as $layout) {
 				
 				// skip layout if the current layout key does not match
-				if( $current && $current !== $layout['name'] ) {
+				if ($current && $current !== $layout['name']) {
 					
 					continue;
 					
@@ -1816,13 +1816,13 @@ 
 				
 				
 				// extract sub fields
-				$sub_fields = acf_extract_var( $layout, 'sub_fields');
+				$sub_fields = acf_extract_var($layout, 'sub_fields');
 				
-				if( !empty($sub_fields) ) {
+				if ( ! empty($sub_fields)) {
 					
-					foreach( $sub_fields as $sub_field ) {
+					foreach ($sub_fields as $sub_field) {
 						
-						if( $sub_field['name'] == $selector || $sub_field['key'] == $selector ) {
+						if ($sub_field['name'] == $selector || $sub_field['key'] == $selector) {
 							
 							// return
 							return $sub_field;

Braces +78 added lines, -26 removed lines

@@ -77,7 +77,9 @@ 
 	
 	
 	// return true if label exists
-	if( $label !== '' ) return true;
+	if( $label !== '' ) {
+		return true;
+	}
 		
 	
 	// return
@@ -102,19 +104,27 @@ 
 function acf_is_field_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;
+	}
 	
 	
 	// default - starts with 'field_'
-	if( substr($key, 0, 6) === 'field_' ) return true;
+	if( substr($key, 0, 6) === 'field_' ) {
+		return true;
+	}
 	
 	
 	// special - allow local field key to be any string
-	if( acf_is_local_field($key) ) return true;
+	if( acf_is_local_field($key) ) {
+		return true;
+	}
 	
 	
 	// return
@@ -139,11 +149,15 @@ 
 function acf_get_valid_field( $field = false ) {
 	
 	// $field must be an array
-	if( !is_array($field) ) $field = array();
+	if( !is_array($field) ) {
+		$field = array();
+	}
 	
 	
 	// bail ealry if already valid
-	if( !empty($field['_valid']) ) return $field;
+	if( !empty($field['_valid']) ) {
+		return $field;
+	}
 	
 	
 	// defaults
@@ -211,7 +225,9 @@ 
 function acf_prepare_field( $field ) {
 	
 	// bail early if already prepared
-	if( $field['_input'] ) return $field;
+	if( $field['_input'] ) {
+		return $field;
+	}
 	
 	
 	// _input
@@ -271,11 +287,15 @@ 
 function acf_is_sub_field( $field ) {
 	
 	// local field uses a field instead of ID
-	if( acf_is_field_key($field['parent']) ) return true;
+	if( acf_is_field_key($field['parent']) ) {
+		return true;
+	}
 	
 	
 	// attempt to load parent field
-	if( acf_get_field($field['parent']) ) return true;
+	if( acf_get_field($field['parent']) ) {
+		return true;
+	}
 	
 	
 	// return
@@ -342,7 +362,9 @@ 
 function acf_render_fields( $post_id = 0, $fields, $el = 'div', $instruction = 'label' ) {
 	
 	// bail early if no fields
-	if( empty($fields) ) return false;
+	if( empty($fields) ) {
+		return false;
+	}
 	
 		
 	// remove corrupt fields
@@ -641,7 +663,9 @@ 
 	
 	
 	// bail early if no parent
-	if( !$parent ) return false;
+	if( !$parent ) {
+		return false;
+	}
 	
 	
 	// vars
@@ -686,14 +710,18 @@ 
 	
 	
 	// bail early if no ID
-	if( empty($id) ) return false;
+	if( empty($id) ) {
+		return false;
+	}
 	
 	
 	// cache
 	$found = false;
 	$cache = wp_cache_get( 'get_fields/parent=' . $id, 'acf', false, $found );
 	
-	if( $found ) return $cache;
+	if( $found ) {
+		return $cache;
+	}
 	
 	
 	// args
@@ -787,7 +815,9 @@ 
 		$found = false;
 		$cache = wp_cache_get( $cache_key, 'acf', false, $found );
 		
-		if( $found ) return $cache;
+		if( $found ) {
+			return $cache;
+		}
 		
 	}
 	
@@ -941,7 +971,9 @@ 
 	
 	
 	// bail early if no post_id
-	if( !$post_id ) return false;
+	if( !$post_id ) {
+		return false;
+	}
 		
 	
 	// return
@@ -981,7 +1013,9 @@ 
 	
 	
 	// bail early if no posts
-	if( empty($posts) ) return false;
+	if( empty($posts) ) {
+		return false;
+	}
 	
 	
 	// return
@@ -1050,7 +1084,9 @@ 
 	
 	
 	// bail early if no field
-	if( !$field ) return false;
+	if( !$field ) {
+		return false;
+	}
 	
 	
 	// Override name - allows the $selector to be a sub field (images_0_image)
@@ -1099,7 +1135,9 @@ 
 	
 	
 	// validate
-	if( empty($posts) ) return 0;
+	if( empty($posts) ) {
+		return 0;
+	}
 	
 	
 	// return
@@ -1125,7 +1163,9 @@ 
 function acf_update_field( $field = false, $specific = false ) {
 	
 	// $field must be an array
-	if( !is_array($field) ) return false;
+	if( !is_array($field) ) {
+		return false;
+	}
 	
 	
 	// validate
@@ -1306,7 +1346,9 @@ 
 function acf_duplicate_fields( $fields, $new_parent = 0 ) {
 	
 	// bail early if no fields
-	if( empty($fields) ) return;
+	if( empty($fields) ) {
+		return;
+	}
 	
 	
 	// create new field keys (for conditional logic fixes)
@@ -1482,7 +1524,9 @@ 
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if( empty($field) ) {
+		return false;
+	}
 	
 	
 	// delete field
@@ -1529,7 +1573,9 @@ 
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if( empty($field) ) {
+		return false;
+	}
 	
 	
 	// delete field
@@ -1569,7 +1615,9 @@ 
 	
 	
 	// bail early if field did not load correctly
-	if( empty($field) ) return false;
+	if( empty($field) ) {
+		return false;
+	}
 	
 	
 	// delete field
@@ -1601,7 +1649,9 @@ 
 function acf_prepare_fields_for_export( $fields = false ) {
 	
 	// validate
-	if( empty($fields) ) return $fields;
+	if( empty($fields) ) {
+		return $fields;
+	}
 	
 	
 	// format
@@ -1674,7 +1724,9 @@ 
 function acf_prepare_fields_for_import( $fields = false ) {
 	
 	// validate
-	if( empty($fields) ) return $fields;
+	if( empty($fields) ) {
+		return $fields;
+	}
 	
 	
 	// re-index array

includes/acf/api/api-helpers.php

Doc Comments +34 added lines

@@ -13,6 +13,9 @@ 
 *  @return	(mixed)
 */
 
+/**
+ * @param string $name
+ */
 function acf_get_setting( $name, $default = null ) {
 	
 	// vars
@@ -46,6 +49,9 @@ 
 *  @return	(boolean)
 */
 
+/**
+ * @param string $name
+ */
 function acf_get_compatibility( $name ) {
 	
 	return apply_filters( "acf/compatibility/{$name}", false );
@@ -67,6 +73,9 @@ 
 *  @return	n/a
 */
 
+/**
+ * @param string $name
+ */
 function acf_update_setting( $name, $value ) {
 	
 	acf()->settings[ $name ] = $value;
@@ -88,6 +97,10 @@ 
 *  @return	n/a
 */
 
+/**
+ * @param string $name
+ * @param string $value
+ */
 function acf_append_setting( $name, $value ) {
 	
 	// createa array if needed
@@ -116,6 +129,9 @@ 
 *  @return	(boolean)
 */
 
+/**
+ * @param string $name
+ */
 function acf_has_done( $name ) {
 	
 	// vars
@@ -189,6 +205,9 @@ 
 *  @return	$post_id (int)
 */
 
+/**
+ * @param string $file
+ */
 function acf_include( $file ) {
 	
 	$path = acf_get_path( $file );
@@ -523,6 +542,9 @@ 
 *  @return	(mixed)
 */
 
+/**
+ * @param string $default
+ */
 function acf_extract_var( &$array, $key, $default = null ) {
 	
 	// check if exists
@@ -560,6 +582,9 @@ 
 *  @return	$post_id (int)
 */
 
+/**
+ * @param string[] $keys
+ */
 function acf_extract_vars( &$array, $keys ) {
 	
 	$r = array();
@@ -713,6 +738,9 @@ 
 *  @return	(boolean)
 */
 
+/**
+ * @param string $value
+ */
 function acf_verify_nonce( $value, $post_id = 0 ) {
 	
 	// vars
@@ -1903,6 +1931,9 @@ 
 *  @return	(boolean)
 */
 
+/**
+ * @param string $needle
+ */
 function acf_str_exists( $needle, $haystack ) {
 	
 	// return true if $haystack contains the $needle
@@ -2376,6 +2407,9 @@ 
 *  @return	$post_id (int)
 */
 
+/**
+ * @return string
+ */
 function acf_get_user_setting( $name = '', $default = false ) {
 	
 	// get current user id

Indentation +63 added lines, -63 removed lines

@@ -1475,7 +1475,7 @@ 
 	}
 	
     
-    // get bits
+	// get bits
 	$glue = 'AND';
 	$bits = explode($glue, $sql);
 	
@@ -1496,8 +1496,8 @@ 
 	$sql = implode($glue, $bits);
     
     
-    // return
-    return $sql;
+	// return
+	return $sql;
     
 }
 
@@ -1831,60 +1831,60 @@ 
 	
 	
 	// http://snipplr.com/view.php?codeview&id=60559
-    $result      = '';
-    $pos         = 0;
-    $strLen      = strlen($json);
-    $indentStr   = "    ";
-    $newLine     = "\n";
-    $prevChar    = '';
-    $outOfQuotes = true;
-
-    for ($i=0; $i<=$strLen; $i++) {
-
-        // Grab the next character in the string.
-        $char = substr($json, $i, 1);
-
-        // Are we inside a quoted string?
-        if ($char == '"' && $prevChar != '\\') {
-            $outOfQuotes = !$outOfQuotes;
+	$result      = '';
+	$pos         = 0;
+	$strLen      = strlen($json);
+	$indentStr   = "    ";
+	$newLine     = "\n";
+	$prevChar    = '';
+	$outOfQuotes = true;
+
+	for ($i=0; $i<=$strLen; $i++) {
+
+		// Grab the next character in the string.
+		$char = substr($json, $i, 1);
+
+		// Are we inside a quoted string?
+		if ($char == '"' && $prevChar != '\\') {
+			$outOfQuotes = !$outOfQuotes;
         
-        // If this character is the end of an element, 
-        // output a new line and indent the next line.
-        } else if(($char == '}' || $char == ']') && $outOfQuotes) {
-            $result .= $newLine;
-            $pos --;
-            for ($j=0; $j<$pos; $j++) {
-                $result .= $indentStr;
-            }
-        }
+		// If this character is the end of an element, 
+		// output a new line and indent the next line.
+		} else if(($char == '}' || $char == ']') && $outOfQuotes) {
+			$result .= $newLine;
+			$pos --;
+			for ($j=0; $j<$pos; $j++) {
+				$result .= $indentStr;
+			}
+		}
         
-        // Add the character to the result string.
-        $result .= $char;
+		// Add the character to the result string.
+		$result .= $char;
 		
 		// If this character is ':' adda space after it
-        if($char == ':' && $outOfQuotes) {
-            $result .= ' ';
-        }
+		if($char == ':' && $outOfQuotes) {
+			$result .= ' ';
+		}
         
-        // If the last character was the beginning of an element, 
-        // output a new line and indent the next line.
-        if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
-            $result .= $newLine;
-            if ($char == '{' || $char == '[') {
-                $pos ++;
-            }
+		// If the last character was the beginning of an element, 
+		// output a new line and indent the next line.
+		if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
+			$result .= $newLine;
+			if ($char == '{' || $char == '[') {
+				$pos ++;
+			}
             
-            for ($j = 0; $j < $pos; $j++) {
-                $result .= $indentStr;
-            }
-        }
+			for ($j = 0; $j < $pos; $j++) {
+				$result .= $indentStr;
+			}
+		}
         
-        $prevChar = $char;
-    }
+		$prevChar = $char;
+	}
 	
 	
 	// return
-    return $result;
+	return $result;
 	
 }
 
@@ -2035,21 +2035,21 @@ 
 	
 	$dir = opendir( $path );
 
-    while(false !== ( $file = readdir($dir)) ) {
+	while(false !== ( $file = readdir($dir)) ) {
     
-    	// only php files
-    	if( substr($file, -4) !== '.php' ) {
+		// only php files
+		if( substr($file, -4) !== '.php' ) {
     	
-	    	continue;
+			continue;
 	    	
-    	}
+		}
     	
     	
-    	// get version number
-    	$update_version = substr($file, 0, -4);
+		// get version number
+		$update_version = substr($file, 0, -4);
     	
     	
-    	// ignore if update is for a future version. May exist for testing
+		// ignore if update is for a future version. May exist for testing
 		if( version_compare( $update_version, $plugin_version, '>') ) {
 		
 			continue;
@@ -2064,14 +2064,14 @@ 
 		}
 		
 		
-    	// append
-        $updates[] = $update_version;
+		// append
+		$updates[] = $update_version;
         
-    }
+	}
     
     
-    // return
-    return $updates;
+	// return
+	return $updates;
 	
 }
 
@@ -2994,7 +2994,7 @@ 
 		
 		if( $pos !== false ) {
 			
-		    $url = substr_replace($url, '', $pos, $length);
+			$url = substr_replace($url, '', $pos, $length);
 		    
 		}
 				
@@ -3592,8 +3592,8 @@ 
 function _acf_settings_slug( $v ) {
 	
 	$basename = acf_get_setting('basename');
-    $slug = explode('/', $basename);
-    $slug = current($slug);
+	$slug = explode('/', $basename);
+	$slug = current($slug);
 	
 	return $slug;
 }

Spacing +448 added lines, -448 removed lines

@@ -13,18 +13,18 @@ 
 *  @return	(mixed)
 */
 
-function acf_get_setting( $name, $default = null ) {
+function acf_get_setting($name, $default = null) {
 	
 	// vars
 	$settings = acf()->settings;
 	
 	
 	// find setting
-	$setting = acf_maybe_get( $settings, $name, $default );
+	$setting = acf_maybe_get($settings, $name, $default);
 	
 	
 	// filter for 3rd party customization
-	$setting = apply_filters( "acf/settings/{$name}", $setting );
+	$setting = apply_filters("acf/settings/{$name}", $setting);
 	
 	
 	// return
@@ -46,9 +46,9 @@ 
 *  @return	(boolean)
 */
 
-function acf_get_compatibility( $name ) {
+function acf_get_compatibility($name) {
 	
-	return apply_filters( "acf/compatibility/{$name}", false );
+	return apply_filters("acf/compatibility/{$name}", false);
 	
 }
 
@@ -67,9 +67,9 @@ 
 *  @return	n/a
 */
 
-function acf_update_setting( $name, $value ) {
+function acf_update_setting($name, $value) {
 	
-	acf()->settings[ $name ] = $value;
+	acf()->settings[$name] = $value;
 	
 }
 
@@ -88,18 +88,18 @@ 
 *  @return	n/a
 */
 
-function acf_append_setting( $name, $value ) {
+function acf_append_setting($name, $value) {
 	
 	// createa array if needed
-	if( !isset(acf()->settings[ $name ]) ) {
+	if ( ! isset(acf()->settings[$name])) {
 		
-		acf()->settings[ $name ] = array();
+		acf()->settings[$name] = array();
 		
 	}
 	
 	
 	// append to array
-	acf()->settings[ $name ][] = $value;
+	acf()->settings[$name][] = $value;
 }
 
 
@@ -116,14 +116,14 @@ 
 *  @return	(boolean)
 */
 
-function acf_has_done( $name ) {
+function acf_has_done($name) {
 	
 	// vars
-	$setting = 'has_done_' . $name;
+	$setting = 'has_done_'.$name;
 	
 	
 	// return true if already done
-	if( acf_get_setting($setting) ) return true;
+	if (acf_get_setting($setting)) return true;
 	
 	
 	// update setting
@@ -149,9 +149,9 @@ 
 *  @return	(string)
 */
 
-function acf_get_path( $path ) {
+function acf_get_path($path) {
 	
-	return acf_get_setting('path') . $path;
+	return acf_get_setting('path').$path;
 	
 }
 
@@ -169,9 +169,9 @@ 
 *  @return	(string)
 */
 
-function acf_get_dir( $path ) {
+function acf_get_dir($path) {
 	
-	return acf_get_setting('dir') . $path;
+	return acf_get_setting('dir').$path;
 	
 }
 
@@ -189,13 +189,13 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_include( $file ) {
+function acf_include($file) {
 	
-	$path = acf_get_path( $file );
+	$path = acf_get_path($file);
 	
-	if( file_exists($path) ) {
+	if (file_exists($path)) {
 		
-		include_once( $path );
+		include_once($path);
 		
 	}
 	
@@ -216,10 +216,10 @@ 
 *  @return	$args (array)
 */
 
-function acf_parse_args( $args, $defaults = array() ) {
+function acf_parse_args($args, $defaults = array()) {
 	
 	// $args may not be na array!
-	if( !is_array($args) ) {
+	if ( ! is_array($args)) {
 		
 		$args = array();
 		
@@ -227,11 +227,11 @@ 
 	
 	
 	// parse args
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 	
 	
 	// parse types
-	$args = acf_parse_types( $args );
+	$args = acf_parse_types($args);
 	
 	
 	// return
@@ -253,7 +253,7 @@ 
 *  @return	$var (mixed)
 */
 
-function acf_parse_types( $array ) {
+function acf_parse_types($array) {
 	
 	// some keys are restricted
 	$restricted = array(
@@ -266,12 +266,12 @@ 
 	
 	
 	// loop
-	foreach( array_keys($array) as $k ) {
+	foreach (array_keys($array) as $k) {
 		
 		// parse type if not restricted
-		if( !in_array($k, $restricted, true) ) {
+		if ( ! in_array($k, $restricted, true)) {
 			
-			$array[ $k ] = acf_parse_type( $array[ $k ] );
+			$array[$k] = acf_parse_type($array[$k]);
 			
 		}
 
@@ -295,17 +295,17 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_parse_type( $v ) {
+function acf_parse_type($v) {
 	
 	// test for array
-	if( is_array($v) ) {
+	if (is_array($v)) {
 		
 		return acf_parse_types($v);
 	}
 	
 	
 	// bail early if not string
-	if( !is_string($v) ) {
+	if ( ! is_string($v)) {
 		
 		return $v;
 				
@@ -317,9 +317,9 @@ 
 	
 	
 	// numbers
-	if( is_numeric($v) && strval((int)$v) === $v ) {
+	if (is_numeric($v) && strval((int) $v) === $v) {
 		
-		$v = intval( $v );
+		$v = intval($v);
 		
 	}
 	
@@ -344,14 +344,14 @@ 
 *  @return	n/a
 */
 
-function acf_get_view( $view_name = '', $args = array() ) {
+function acf_get_view($view_name = '', $args = array()) {
 
 	// vars
 	$path = acf_get_path("admin/views/{$view_name}.php");
 	
-	if( file_exists($path) ) {
+	if (file_exists($path)) {
 		
-		include( $path );
+		include($path);
 		
 	}
 	
@@ -371,10 +371,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_merge_atts( $atts, $extra = array() ) {
+function acf_merge_atts($atts, $extra = array()) {
 	
 	// bail ealry if no $extra
-	if( empty($extra) ) {
+	if (empty($extra)) {
 		
 		return $atts;
 		
@@ -382,21 +382,21 @@ 
 	
 	
 	// merge in new atts
-	foreach( $extra as $k => $v ) {
+	foreach ($extra as $k => $v) {
 			
-		if( $k == 'class' || $k == 'style' ) {
+		if ($k == 'class' || $k == 'style') {
 			
-			if( $v === '' ) {
+			if ($v === '') {
 				
 				continue;
 				
 			}
 			
-			$v = $atts[ $k ] . ' ' . $v;
+			$v = $atts[$k].' '.$v;
 			
 		}
 		
-		$atts[ $k ] = $v;
+		$atts[$k] = $v;
 		
 	}
 	
@@ -420,19 +420,19 @@ 
 *  @return	n/a
 */
 
-function acf_esc_attr( $atts ) {
+function acf_esc_attr($atts) {
 	
 	// is string?
-	if( is_string($atts) ) {
+	if (is_string($atts)) {
 		
-		$atts = trim( $atts );
-		return esc_attr( $atts );
+		$atts = trim($atts);
+		return esc_attr($atts);
 		
 	}
 	
 	
 	// validate
-	if( empty($atts) ) {
+	if (empty($atts)) {
 		
 		return '';
 		
@@ -444,20 +444,20 @@ 
 	
 	
 	// loop through and render
-	foreach( $atts as $k => $v ) {
+	foreach ($atts as $k => $v) {
 		
 		// object
-		if( is_array($v) || is_object($v) ) {
+		if (is_array($v) || is_object($v)) {
 			
 			$v = json_encode($v);
 		
 		// boolean	
-		} elseif( is_bool($v) ) {
+		} elseif (is_bool($v)) {
 			
 			$v = $v ? 1 : 0;
 		
 		// string
-		} elseif( is_string($v) ) {
+		} elseif (is_string($v)) {
 			
 			$v = trim($v);
 			
@@ -465,7 +465,7 @@ 
 		
 		
 		// append
-		$e[] = $k . '="' . esc_attr( $v ) . '"';
+		$e[] = $k.'="'.esc_attr($v).'"';
 	}
 	
 	
@@ -474,9 +474,9 @@ 
 	
 }
 
-function acf_esc_attr_e( $atts ) {
+function acf_esc_attr_e($atts) {
 	
-	echo acf_esc_attr( $atts );
+	echo acf_esc_attr($atts);
 	
 }
 
@@ -494,17 +494,17 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_hidden_input( $atts ) {
+function acf_get_hidden_input($atts) {
 	
 	$atts['type'] = 'hidden';
 	
-	return '<input ' . acf_esc_attr( $atts ) . ' />';
+	return '<input '.acf_esc_attr($atts).' />';
 	
 }
 
-function acf_hidden_input( $atts ) {
+function acf_hidden_input($atts) {
 	
-	echo acf_get_hidden_input( $atts );
+	echo acf_get_hidden_input($atts);
 	
 }
 
@@ -523,17 +523,17 @@ 
 *  @return	(mixed)
 */
 
-function acf_extract_var( &$array, $key, $default = null ) {
+function acf_extract_var(&$array, $key, $default = null) {
 	
 	// check if exists
-	if( is_array($array) && array_key_exists($key, $array) ) {
+	if (is_array($array) && array_key_exists($key, $array)) {
 		
 		// store value
-		$v = $array[ $key ];
+		$v = $array[$key];
 		
 		
 		// unset
-		unset( $array[ $key ] );
+		unset($array[$key]);
 		
 		
 		// return
@@ -560,13 +560,13 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_extract_vars( &$array, $keys ) {
+function acf_extract_vars(&$array, $keys) {
 	
 	$r = array();
 	
-	foreach( $keys as $key ) {
+	foreach ($keys as $key) {
 		
-		$r[ $key ] = acf_extract_var( $array, $key );
+		$r[$key] = acf_extract_var($array, $key);
 		
 	}
 	
@@ -588,26 +588,26 @@ 
 *  @return	(array)
 */
 
-function acf_get_post_types( $exclude = array(), $include = array() ) {
+function acf_get_post_types($exclude = array(), $include = array()) {
 	
 	// get all custom post types
 	$post_types = get_post_types();
 	
 	
 	// core exclude
-	$exclude = wp_parse_args( $exclude, array('acf-field', 'acf-field-group', 'revision', 'nav_menu_item') );
+	$exclude = wp_parse_args($exclude, array('acf-field', 'acf-field-group', 'revision', 'nav_menu_item'));
 	
 	
 	// include
-	if( !empty($include) ) {
+	if ( ! empty($include)) {
 		
-		foreach( array_keys($include) as $i ) {
+		foreach (array_keys($include) as $i) {
 			
-			$post_type = $include[ $i ];
+			$post_type = $include[$i];
 			
-			if( post_type_exists($post_type) ) {	
+			if (post_type_exists($post_type)) {	
 									
-				$post_types[ $post_type ] = $post_type;
+				$post_types[$post_type] = $post_type;
 				
 			}
 			
@@ -617,9 +617,9 @@ 
 	
 	
 	// exclude
-	foreach( array_values($exclude) as $i ) {
+	foreach (array_values($exclude) as $i) {
 		
-		unset( $post_types[ $i ] );
+		unset($post_types[$i]);
 		
 	}
 	
@@ -634,10 +634,10 @@ 
 }
 
 
-function acf_get_pretty_post_types( $post_types = array() ) {
+function acf_get_pretty_post_types($post_types = array()) {
 	
 	// get post types
-	if( empty($post_types) ) {
+	if (empty($post_types)) {
 		
 		// get all custom post types
 		$post_types = acf_get_post_types();
@@ -649,14 +649,14 @@ 
 	$ref = array();
 	$r = array();
 	
-	foreach( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		
 		// vars
 		$label = $post_type;
 		
 		
 		// check that object exists (case exists when importing field group from another install and post type does not exist)
-		if( post_type_exists($post_type) ) {
+		if (post_type_exists($post_type)) {
 			
 			$obj = get_post_type_object($post_type);
 			$label = $obj->labels->singular_name;
@@ -665,29 +665,29 @@ 
 		
 		
 		// append to r
-		$r[ $post_type ] = $label;
+		$r[$post_type] = $label;
 		
 		
 		// increase counter
-		if( !isset($ref[ $label ]) ) {
+		if ( ! isset($ref[$label])) {
 			
-			$ref[ $label ] = 0;
+			$ref[$label] = 0;
 			
 		}
 		
-		$ref[ $label ]++;
+		$ref[$label]++;
 	}
 	
 	
 	// get slugs
-	foreach( array_keys($r) as $i ) {
+	foreach (array_keys($r) as $i) {
 		
 		// vars
-		$post_type = $r[ $i ];
+		$post_type = $r[$i];
 		
-		if( $ref[ $post_type ] > 1 ) {
+		if ($ref[$post_type] > 1) {
 			
-			$r[ $i ] .= ' (' . $i . ')';
+			$r[$i] .= ' ('.$i.')';
 			
 		}
 		
@@ -713,14 +713,14 @@ 
 *  @return	(boolean)
 */
 
-function acf_verify_nonce( $value, $post_id = 0 ) {
+function acf_verify_nonce($value, $post_id = 0) {
 	
 	// vars
-	$nonce = acf_maybe_get( $_POST, '_acfnonce' );
+	$nonce = acf_maybe_get($_POST, '_acfnonce');
 	
 	
 	// bail early if no nonce or if nonce does not match (post|user|comment|term)
-	if( !$nonce || !wp_verify_nonce($nonce, $value) ) {
+	if ( ! $nonce || ! wp_verify_nonce($nonce, $value)) {
 		
 		return false;
 		
@@ -728,25 +728,25 @@ 
 	
 	
 	// if saving specific post
-	if( $post_id ) {
+	if ($post_id) {
 		
 		// vars
-		$form_post_id = (int) acf_maybe_get( $_POST, 'post_ID' );
-		$post_parent = wp_is_post_revision( $post_id );
+		$form_post_id = (int) acf_maybe_get($_POST, 'post_ID');
+		$post_parent = wp_is_post_revision($post_id);
 		
 			
 		// 1. no $_POST['post_id'] (shopp plugin)
-		if( !$form_post_id ) {
+		if ( ! $form_post_id) {
 			
 			// do nothing (don't remove this if statement!)
 			
 		// 2. direct match (this is the post we were editing)
-		} elseif( $post_id === $form_post_id ) {
+		} elseif ($post_id === $form_post_id) {
 			
 			// do nothing (don't remove this if statement!)
 			
 		// 3. revision (this post is a revision of the post we were editing)
-		} elseif( $post_parent === $form_post_id ) {
+		} elseif ($post_parent === $form_post_id) {
 			
 			// return true early and prevent $_POST['_acfnonce'] from being reset
 			// this will allow another save_post to save the real post
@@ -791,7 +791,7 @@ 
 function acf_verify_ajax() {
 	
 	// bail early if not acf action
-	if( empty($_POST['action']) || substr($_POST['action'], 0, 3) !== 'acf' ) {
+	if (empty($_POST['action']) || substr($_POST['action'], 0, 3) !== 'acf') {
 		
 		return false;
 		
@@ -799,7 +799,7 @@ 
 	
 	
 	// bail early if not acf nonce
-	if( empty($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'acf_nonce') ) {
+	if (empty($_POST['nonce']) || ! wp_verify_nonce($_POST['nonce'], 'acf_nonce')) {
 	
 		return false;
 		
@@ -830,7 +830,7 @@ 
 *  @return	(int) message ID (array position)
 */
 
-function acf_add_admin_notice( $text, $class = '', $wrap = 'p' )
+function acf_add_admin_notice($text, $class = '', $wrap = 'p')
 {
 	// vars
 	$admin_notices = acf_get_admin_notices();
@@ -845,11 +845,11 @@ 
 	
 	
 	// update
-	acf_update_setting( 'admin_notices', $admin_notices );
+	acf_update_setting('admin_notices', $admin_notices);
 	
 	
 	// return
-	return ( count( $admin_notices ) - 1 );
+	return (count($admin_notices) - 1);
 	
 }
 
@@ -870,11 +870,11 @@ 
 function acf_get_admin_notices()
 {
 	// vars
-	$admin_notices = acf_get_setting( 'admin_notices' );
+	$admin_notices = acf_get_setting('admin_notices');
 	
 	
 	// validate
-	if( !$admin_notices )
+	if ( ! $admin_notices)
 	{
 		$admin_notices = array();
 	}
@@ -906,9 +906,9 @@ 
 	
 	// vars
 	$sizes = array(
-		'thumbnail'	=>	__("Thumbnail",'acf'),
-		'medium'	=>	__("Medium",'acf'),
-		'large'		=>	__("Large",'acf')
+		'thumbnail'	=>	__("Thumbnail", 'acf'),
+		'medium'	=>	__("Medium", 'acf'),
+		'large'		=>	__("Large", 'acf')
 	);
 	
 	
@@ -917,12 +917,12 @@ 
 	
 	
 	// add extra registered sizes
-	if( !empty($all_sizes) ) {
+	if ( ! empty($all_sizes)) {
 		
-		foreach( $all_sizes as $size ) {
+		foreach ($all_sizes as $size) {
 			
 			// bail early if already in array
-			if( isset($sizes[ $size ]) ) {
+			if (isset($sizes[$size])) {
 			
 				continue;
 				
@@ -931,8 +931,8 @@ 
 			
 			// append to array
 			$label = str_replace('-', ' ', $size);
-			$label = ucwords( $label );
-			$sizes[ $size ] = $label;
+			$label = ucwords($label);
+			$sizes[$size] = $label;
 			
 		}
 		
@@ -940,15 +940,15 @@ 
 	
 	
 	// add sizes
-	foreach( array_keys($sizes) as $s ) {
+	foreach (array_keys($sizes) as $s) {
 		
 		// vars
-		$w = isset($_wp_additional_image_sizes[$s]['width']) ? $_wp_additional_image_sizes[$s]['width'] : get_option( "{$s}_size_w" );
-		$h = isset($_wp_additional_image_sizes[$s]['height']) ? $_wp_additional_image_sizes[$s]['height'] : get_option( "{$s}_size_h" );
+		$w = isset($_wp_additional_image_sizes[$s]['width']) ? $_wp_additional_image_sizes[$s]['width'] : get_option("{$s}_size_w");
+		$h = isset($_wp_additional_image_sizes[$s]['height']) ? $_wp_additional_image_sizes[$s]['height'] : get_option("{$s}_size_h");
 		
-		if( $w && $h ) {
+		if ($w && $h) {
 			
-			$sizes[ $s ] .= " ({$w} x {$h})";
+			$sizes[$s] .= " ({$w} x {$h})";
 			
 		}
 		
@@ -956,11 +956,11 @@ 
 	
 	
 	// add full end
-	$sizes['full'] = __("Full Size",'acf');
+	$sizes['full'] = __("Full Size", 'acf');
 	
 	
 	// filter for 3rd party customization
-	$sizes = apply_filters( 'acf/get_image_sizes', $sizes );
+	$sizes = apply_filters('acf/get_image_sizes', $sizes);
 	
 	
 	// return
@@ -985,21 +985,21 @@ 
 function acf_get_taxonomies() {
 
 	// get all taxonomies
-	$taxonomies = get_taxonomies( false, 'objects' );
-	$ignore = array( 'nav_menu', 'link_category' );
+	$taxonomies = get_taxonomies(false, 'objects');
+	$ignore = array('nav_menu', 'link_category');
 	$r = array();
 	
 	
 	// populate $r
-	foreach( $taxonomies as $taxonomy )
+	foreach ($taxonomies as $taxonomy)
 	{
-		if( in_array($taxonomy->name, $ignore) )
+		if (in_array($taxonomy->name, $ignore))
 		{
 			continue;
 		
 		}
 		
-		$r[ $taxonomy->name ] = $taxonomy->name; //"{$taxonomy->labels->singular_name}"; // ({$taxonomy->name})
+		$r[$taxonomy->name] = $taxonomy->name; //"{$taxonomy->labels->singular_name}"; // ({$taxonomy->name})
 	}
 	
 	
@@ -1009,10 +1009,10 @@ 
 }
 
 
-function acf_get_pretty_taxonomies( $taxonomies = array() ) {
+function acf_get_pretty_taxonomies($taxonomies = array()) {
 	
 	// get post types
-	if( empty($taxonomies) ) {
+	if (empty($taxonomies)) {
 		
 		// get all custom post types
 		$taxonomies = acf_get_taxonomies();
@@ -1024,38 +1024,38 @@ 
 	$ref = array();
 	$r = array();
 	
-	foreach( array_keys($taxonomies) as $i ) {
+	foreach (array_keys($taxonomies) as $i) {
 		
 		// vars
-		$taxonomy = acf_extract_var( $taxonomies, $i);
-		$obj = get_taxonomy( $taxonomy );
+		$taxonomy = acf_extract_var($taxonomies, $i);
+		$obj = get_taxonomy($taxonomy);
 		$name = $obj->labels->singular_name;
 		
 		
 		// append to r
-		$r[ $taxonomy ] = $name;
+		$r[$taxonomy] = $name;
 		
 		
 		// increase counter
-		if( !isset($ref[ $name ]) ) {
+		if ( ! isset($ref[$name])) {
 			
-			$ref[ $name ] = 0;
+			$ref[$name] = 0;
 			
 		}
 		
-		$ref[ $name ]++;
+		$ref[$name]++;
 	}
 	
 	
 	// get slugs
-	foreach( array_keys($r) as $i ) {
+	foreach (array_keys($r) as $i) {
 		
 		// vars
-		$taxonomy = $r[ $i ];
+		$taxonomy = $r[$i];
 		
-		if( $ref[ $taxonomy ] > 1 ) {
+		if ($ref[$taxonomy] > 1) {
 			
-			$r[ $i ] .= ' (' . $i . ')';
+			$r[$i] .= ' ('.$i.')';
 			
 		}
 		
@@ -1081,14 +1081,14 @@ 
 *  @return	(array)
 */
 
-function acf_get_taxonomy_terms( $taxonomies = array() ) {
+function acf_get_taxonomy_terms($taxonomies = array()) {
 	
 	// force array
-	$taxonomies = acf_get_array( $taxonomies );
+	$taxonomies = acf_get_array($taxonomies);
 	
 	
 	// get pretty taxonomy names
-	$taxonomies = acf_get_pretty_taxonomies( $taxonomies );
+	$taxonomies = acf_get_pretty_taxonomies($taxonomies);
 	
 	
 	// vars
@@ -1096,35 +1096,35 @@ 
 	
 	
 	// populate $r
-	foreach( array_keys($taxonomies) as $taxonomy ) {
+	foreach (array_keys($taxonomies) as $taxonomy) {
 		
 		// vars
-		$label = $taxonomies[ $taxonomy ];
-		$terms = get_terms( $taxonomy, array( 'hide_empty' => false ) );
-		$is_hierarchical = is_taxonomy_hierarchical( $taxonomy );
+		$label = $taxonomies[$taxonomy];
+		$terms = get_terms($taxonomy, array('hide_empty' => false));
+		$is_hierarchical = is_taxonomy_hierarchical($taxonomy);
 		
 		
 		// bail early i no terms
-		if( empty($terms) ) continue;
+		if (empty($terms)) continue;
 		
 		
 		// sort into hierachial order!
-		if( $is_hierarchical ) {
+		if ($is_hierarchical) {
 			
-			$terms = _get_term_children( 0, $terms, $taxonomy );
+			$terms = _get_term_children(0, $terms, $taxonomy);
 			
 		}
 		
 		
 		// add placeholder		
-		$r[ $label ] = array();
+		$r[$label] = array();
 		
 		
 		// add choices
-		foreach( $terms as $term ) {
+		foreach ($terms as $term) {
 		
 			$k = "{$taxonomy}:{$term->slug}"; 
-			$r[ $label ][ $k ] = acf_get_term_title( $term );
+			$r[$label][$k] = acf_get_term_title($term);
 			
 		}
 		
@@ -1137,14 +1137,14 @@ 
 }
 
 
-function acf_get_term_title( $term ) {
+function acf_get_term_title($term) {
 	
 	// title
 	$title = $term->name;
 	
 	
 	// empty
-	if( $title === '' ) {
+	if ($title === '') {
 		
 		$title = __('(no title)', 'acf');
 		
@@ -1152,11 +1152,11 @@ 
 	
 	
 	// ancestors
-	if( is_taxonomy_hierarchical($term->taxonomy) ) {
+	if (is_taxonomy_hierarchical($term->taxonomy)) {
 		
-		$ancestors = get_ancestors( $term->term_id, $term->taxonomy );
+		$ancestors = get_ancestors($term->term_id, $term->taxonomy);
 		
-		$title = str_repeat('- ', count($ancestors)) . $title;
+		$title = str_repeat('- ', count($ancestors)).$title;
 		
 	}
 	
@@ -1180,10 +1180,10 @@ 
 *  @return	(array)
 */
 
-function acf_decode_taxonomy_terms( $terms = false ) {
+function acf_decode_taxonomy_terms($terms = false) {
 	
 	// load all taxonomies if not specified in args
-	if( !$terms ) {
+	if ( ! $terms) {
 		
 		$terms = acf_get_taxonomy_terms();
 		
@@ -1194,21 +1194,21 @@ 
 	$r = array();
 	
 	
-	foreach( $terms as $term ) {
+	foreach ($terms as $term) {
 		
 		// vars
-		$data = acf_decode_taxonomy_term( $term );
+		$data = acf_decode_taxonomy_term($term);
 		
 		
 		// create empty array
-		if( !array_key_exists($data['taxonomy'], $r) )
+		if ( ! array_key_exists($data['taxonomy'], $r))
 		{
-			$r[ $data['taxonomy'] ] = array();
+			$r[$data['taxonomy']] = array();
 		}
 		
 		
 		// append to taxonomy
-		$r[ $data['taxonomy'] ][] = $data['term'];
+		$r[$data['taxonomy']][] = $data['term'];
 		
 	}
 	
@@ -1232,7 +1232,7 @@ 
 *  @return	(array)
 */
 
-function acf_decode_taxonomy_term( $string ) {
+function acf_decode_taxonomy_term($string) {
 	
 	// vars
 	$r = array();
@@ -1245,7 +1245,7 @@ 
 	
 	
 	// check data
-	if( isset($data[1]) ) {
+	if (isset($data[1])) {
 		
 		$taxonomy = $data[0];
 		$term = $data[1];
@@ -1322,10 +1322,10 @@ 
 *  @return	(array)
 */
 
-function acf_get_array( $var = false, $delimiter = ',' ) {
+function acf_get_array($var = false, $delimiter = ',') {
 	
 	// is array?
-	if( is_array($var) ) {
+	if (is_array($var)) {
 	
 		return $var;
 	
@@ -1333,7 +1333,7 @@ 
 	
 	
 	// bail early if empty
-	if( empty($var) && !is_numeric($var) ) {
+	if (empty($var) && ! is_numeric($var)) {
 		
 		return array();
 		
@@ -1341,7 +1341,7 @@ 
 	
 	
 	// string 
-	if( is_string($var) && $delimiter ) {
+	if (is_string($var) && $delimiter) {
 		
 		return explode($delimiter, $var);
 		
@@ -1349,7 +1349,7 @@ 
 	
 	
 	// place in array
-	return array( $var );
+	return array($var);
 	
 } 
 
@@ -1367,7 +1367,7 @@ 
 *  @return	(array)
 */
 
-function acf_get_posts( $args = array() ) {
+function acf_get_posts($args = array()) {
 	
 	// vars
 	$posts = array();
@@ -1375,7 +1375,7 @@ 
 	
 	// defaults
 	// leave suppress_filters as true becuase we don't want any plugins to modify the query as we know exactly what 
-	$args = acf_parse_args( $args, array(
+	$args = acf_parse_args($args, array(
 		'posts_per_page'	=> -1,
 		'post_type'			=> '',
 		'post_status'		=> 'any'
@@ -1383,7 +1383,7 @@ 
 	
 
 	// post type
-	if( empty($args['post_type']) ) {
+	if (empty($args['post_type'])) {
 		
 		$args['post_type'] = acf_get_post_types();
 		
@@ -1391,10 +1391,10 @@ 
 	
 	
 	// validate post__in
-	if( $args['post__in'] ) {
+	if ($args['post__in']) {
 		
 		// force value to array
-		$args['post__in'] = acf_get_array( $args['post__in'] );
+		$args['post__in'] = acf_get_array($args['post__in']);
 		
 		
 		// convert to int
@@ -1421,16 +1421,16 @@ 
 	
 	
 	// validate order
-	if( $posts && $args['post__in'] ) {
+	if ($posts && $args['post__in']) {
 		
 		// vars
 		$order = array();
 		
 		
 		// generate sort order
-		foreach( $posts as $i => $post ) {
+		foreach ($posts as $i => $post) {
 			
-			$order[ $i ] = array_search($post->ID, $args['post__in']);
+			$order[$i] = array_search($post->ID, $args['post__in']);
 			
 		}
 		
@@ -1461,14 +1461,14 @@ 
 *  @return	$sql
 */
 
-function _acf_query_remove_post_type( $sql ) {
+function _acf_query_remove_post_type($sql) {
 	
 	// global
 	global $wpdb;
 	
 	
 	// bail ealry if no 'wp_posts.ID IN'
-	if( strpos($sql, "$wpdb->posts.ID IN") === false ) {
+	if (strpos($sql, "$wpdb->posts.ID IN") === false) {
 		
 		return $sql;
 		
@@ -1481,11 +1481,11 @@ 
 	
     
 	// loop through $where and remove any post_type queries
-	foreach( $bits as $i => $bit ) {
+	foreach ($bits as $i => $bit) {
 		
-		if( strpos($bit, "$wpdb->posts.post_type") !== false ) {
+		if (strpos($bit, "$wpdb->posts.post_type") !== false) {
 			
-			unset( $bits[ $i ] );
+			unset($bits[$i]);
 			
 		}
 		
@@ -1516,14 +1516,14 @@ 
 *  @return	(array)
 */
 
-function acf_get_grouped_posts( $args ) {
+function acf_get_grouped_posts($args) {
 	
 	// vars
 	$r = array();
 	
 	
 	// defaults
-	$args = acf_parse_args( $args, array(
+	$args = acf_parse_args($args, array(
 		'posts_per_page'			=> -1,
 		'paged'						=> 0,
 		'post_type'					=> 'post',
@@ -1536,12 +1536,12 @@ 
 
 	
 	// find array of post_type
-	$post_types = acf_get_array( $args['post_type'] );
+	$post_types = acf_get_array($args['post_type']);
 	$post_types_labels = acf_get_pretty_post_types($post_types);
 	
 	
 	// attachment doesn't work if it is the only item in an array
-	if( count($post_types) == 1 ) {
+	if (count($post_types) == 1) {
 	
 		$args['post_type'] = current($post_types);
 		
@@ -1553,7 +1553,7 @@ 
 	
 	
 	// get posts
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 	
 	
 	// remove this filter (only once)
@@ -1561,7 +1561,7 @@ 
 	
 	
 	// loop
-	foreach( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		
 		// vars
 		$this_posts = array();
@@ -1569,11 +1569,11 @@ 
 		
 		
 		// populate $this_posts
-		foreach( array_keys($posts) as $key ) {
+		foreach (array_keys($posts) as $key) {
 		
-			if( $posts[ $key ]->post_type == $post_type ) {
+			if ($posts[$key]->post_type == $post_type) {
 				
-				$this_posts[] = acf_extract_var( $posts, $key );
+				$this_posts[] = acf_extract_var($posts, $key);
 				
 			}
 			
@@ -1581,7 +1581,7 @@ 
 		
 		
 		// bail early if no posts for this post type
-		if( empty($this_posts) ) {
+		if (empty($this_posts)) {
 		
 			continue;
 			
@@ -1590,13 +1590,13 @@ 
 		
 		// sort into hierachial order!
 		// this will fail if a search has taken place because parents wont exist
-		if( is_post_type_hierarchical($post_type) && empty($args['s'])) {
+		if (is_post_type_hierarchical($post_type) && empty($args['s'])) {
 			
 			// vars
-			$match_id = $this_posts[ 0 ]->ID;
+			$match_id = $this_posts[0]->ID;
 			$offset = 0;
 			$length = count($this_posts);
-			$parent = acf_maybe_get( $args, 'post_parent', 0 );
+			$parent = acf_maybe_get($args, 'post_parent', 0);
 			
 			
 			// reset $this_posts
@@ -1610,13 +1610,13 @@ 
 				'post_type'			=> $post_type
 			));
 			
-			$all_posts = get_posts( $all_args );
+			$all_posts = get_posts($all_args);
 			
 			
 			// loop over posts and update $offset
-			foreach( $all_posts as $offset => $p ) {
+			foreach ($all_posts as $offset => $p) {
 				
-				if( $p->ID == $match_id ) {
+				if ($p->ID == $match_id) {
 					
 					break;
 					
@@ -1626,13 +1626,13 @@ 
 			
 			
 			// order posts
-			$all_posts = get_page_children( $parent, $all_posts );
+			$all_posts = get_page_children($parent, $all_posts);
 			
 			
 			// append
-			for( $i = $offset; $i < ($offset + $length); $i++ ) {
+			for ($i = $offset; $i < ($offset + $length); $i++) {
 				
-				$this_posts[] = acf_extract_var( $all_posts, $i);
+				$this_posts[] = acf_extract_var($all_posts, $i);
 				
 			}			
 			
@@ -1640,23 +1640,23 @@ 
 		
 				
 		// populate $this_posts
-		foreach( array_keys($this_posts) as $key ) {
+		foreach (array_keys($this_posts) as $key) {
 			
 			// extract post
-			$post = acf_extract_var( $this_posts, $key );
+			$post = acf_extract_var($this_posts, $key);
 			
 			
 			
 			// add to group
-			$this_group[ $post->ID ] = $post;
+			$this_group[$post->ID] = $post;
 			
 		}
 		
 		
 		// group by post type
-		$post_type_name = $post_types_labels[ $post_type ];
+		$post_type_name = $post_types_labels[$post_type];
 		
-		$r[ $post_type_name ] = $this_group;
+		$r[$post_type_name] = $this_group;
 					
 	}
 	
@@ -1666,7 +1666,7 @@ 
 	
 }
 
-function _acf_orderby_post_type( $ordeby, $wp_query ) {
+function _acf_orderby_post_type($ordeby, $wp_query) {
 	
 	// global
 	global $wpdb;
@@ -1677,10 +1677,10 @@ 
 	
 
 	// prepend SQL
-	if( is_array($post_types) ) {
+	if (is_array($post_types)) {
 		
 		$post_types = implode("','", $post_types);
-		$ordeby = "FIELD({$wpdb->posts}.post_type,'$post_types')," . $ordeby;
+		$ordeby = "FIELD({$wpdb->posts}.post_type,'$post_types'),".$ordeby;
 		
 	}
 	
@@ -1691,10 +1691,10 @@ 
 }
 
 
-function acf_get_post_title( $post = 0 ) {
+function acf_get_post_title($post = 0) {
 	
 	// load post if given an ID
-	if( is_numeric($post) ) {
+	if (is_numeric($post)) {
 		
 		$post = get_post($post);
 		
@@ -1702,11 +1702,11 @@ 
 	
 	
 	// title
-	$title = get_the_title( $post->ID );
+	$title = get_the_title($post->ID);
 	
 	
 	// empty
-	if( $title === '' ) {
+	if ($title === '') {
 		
 		$title = __('(no title)', 'acf');
 		
@@ -1714,19 +1714,19 @@ 
 	
 	
 	// ancestors
-	if( $post->post_type != 'attachment' ) {
+	if ($post->post_type != 'attachment') {
 		
-		$ancestors = get_ancestors( $post->ID, $post->post_type );
+		$ancestors = get_ancestors($post->ID, $post->post_type);
 		
-		$title = str_repeat('- ', count($ancestors)) . $title;
+		$title = str_repeat('- ', count($ancestors)).$title;
 		
 	}
 	
 	
 	// status
-	if( get_post_status( $post->ID ) != "publish" ) {
+	if (get_post_status($post->ID) != "publish") {
 		
-		$title .= ' (' . get_post_status( $post->ID ) . ')';
+		$title .= ' ('.get_post_status($post->ID).')';
 		
 	}
 	
@@ -1737,39 +1737,39 @@ 
 }
 
 
-function acf_order_by_search( $array, $search ) {
+function acf_order_by_search($array, $search) {
 	
 	// vars
 	$weights = array();
-	$needle = strtolower( $search );
+	$needle = strtolower($search);
 	
 	
 	// add key prefix
-	foreach( array_keys($array) as $k ) {
+	foreach (array_keys($array) as $k) {
 		
-		$array[ '_' . $k ] = acf_extract_var( $array, $k );
+		$array['_'.$k] = acf_extract_var($array, $k);
 		
 	}
 
 
 	// add search weight
-	foreach( $array as $k => $v ) {
+	foreach ($array as $k => $v) {
 	
 		// vars
 		$weight = 0;
-		$haystack = strtolower( $v );
-		$strpos = strpos( $haystack, $needle );
+		$haystack = strtolower($v);
+		$strpos = strpos($haystack, $needle);
 		
 		
 		// detect search match
-		if( $strpos !== false ) {
+		if ($strpos !== false) {
 			
 			// set eright to length of match
-			$weight = strlen( $search );
+			$weight = strlen($search);
 			
 			
 			// increase weight if match starts at begining of string
-			if( $strpos == 0 ) {
+			if ($strpos == 0) {
 				
 				$weight++;
 				
@@ -1779,19 +1779,19 @@ 
 		
 		
 		// append to wights
-		$weights[ $k ] = $weight;
+		$weights[$k] = $weight;
 		
 	}
 	
 	
 	// sort the array with menu_order ascending
-	array_multisort( $weights, SORT_DESC, $array );
+	array_multisort($weights, SORT_DESC, $array);
 	
 	
 	// remove key prefix
-	foreach( array_keys($array) as $k ) {
+	foreach (array_keys($array) as $k) {
 		
-		$array[ substr($k,1) ] = acf_extract_var( $array, $k );
+		$array[substr($k, 1)] = acf_extract_var($array, $k);
 		
 	}
 		
@@ -1815,10 +1815,10 @@ 
 *  @return	(string)
 */
 
-function acf_json_encode( $json ) {
+function acf_json_encode($json) {
 	
 	// PHP at least 5.4
-	if( version_compare(PHP_VERSION, '5.4.0', '>=') ) {
+	if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
 		
 		return json_encode($json, JSON_PRETTY_PRINT);
 		
@@ -1839,21 +1839,21 @@ 
     $prevChar    = '';
     $outOfQuotes = true;
 
-    for ($i=0; $i<=$strLen; $i++) {
+    for ($i = 0; $i <= $strLen; $i++) {
 
         // Grab the next character in the string.
         $char = substr($json, $i, 1);
 
         // Are we inside a quoted string?
         if ($char == '"' && $prevChar != '\\') {
-            $outOfQuotes = !$outOfQuotes;
+            $outOfQuotes = ! $outOfQuotes;
         
         // If this character is the end of an element, 
         // output a new line and indent the next line.
-        } else if(($char == '}' || $char == ']') && $outOfQuotes) {
+        } else if (($char == '}' || $char == ']') && $outOfQuotes) {
             $result .= $newLine;
-            $pos --;
-            for ($j=0; $j<$pos; $j++) {
+            $pos--;
+            for ($j = 0; $j < $pos; $j++) {
                 $result .= $indentStr;
             }
         }
@@ -1862,7 +1862,7 @@ 
         $result .= $char;
 		
 		// If this character is ':' adda space after it
-        if($char == ':' && $outOfQuotes) {
+        if ($char == ':' && $outOfQuotes) {
             $result .= ' ';
         }
         
@@ -1871,7 +1871,7 @@ 
         if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
             $result .= $newLine;
             if ($char == '{' || $char == '[') {
-                $pos ++;
+                $pos++;
             }
             
             for ($j = 0; $j < $pos; $j++) {
@@ -1903,10 +1903,10 @@ 
 *  @return	(boolean)
 */
 
-function acf_str_exists( $needle, $haystack ) {
+function acf_str_exists($needle, $haystack) {
 	
 	// return true if $haystack contains the $needle
-	if( is_string($haystack) && strpos($haystack, $needle) !== false ) {
+	if (is_string($haystack) && strpos($haystack, $needle) !== false) {
 		
 		return true;
 		
@@ -1941,38 +1941,38 @@ 
 	
 	
 	// start script
-	$o .= '<script type="text/javascript">' . $nl;
+	$o .= '<script type="text/javascript">'.$nl;
 	
-	$o .= 'console.log("' . $s . '"';
+	$o .= 'console.log("'.$s.'"';
 	
-	if( !empty($args) ) {
+	if ( ! empty($args)) {
 		
-		foreach( $args as $arg ) {
+		foreach ($args as $arg) {
 			
-			if( is_object($arg) || is_array($arg) ) {
+			if (is_object($arg) || is_array($arg)) {
 				
 				$arg = json_encode($arg);
 				
-			} elseif( is_bool($arg) ) {
+			} elseif (is_bool($arg)) {
 				
 				$arg = $arg ? 'true' : 'false';
 				
-			}elseif( is_string($arg) ) {
+			}elseif (is_string($arg)) {
 				
-				$arg = '"' . $arg . '"';
+				$arg = '"'.$arg.'"';
 				
 			}
 			
-			$o .= ', ' . $arg;
+			$o .= ', '.$arg;
 			
 		}
 	}
 	
-	$o .= ');' . $nl;
+	$o .= ');'.$nl;
 	
 	
 	// end script
-	$o .= '</script>' . $nl;
+	$o .= '</script>'.$nl;
 	
 	
 	// echo
@@ -1981,13 +1981,13 @@ 
 
 function acf_debug_start() {
 	
-	acf_update_setting( 'debug_start', memory_get_usage());
+	acf_update_setting('debug_start', memory_get_usage());
 	
 }
 
 function acf_debug_end() {
 	
-	$start = acf_get_setting( 'debug_start' );
+	$start = acf_get_setting('debug_start');
 	$end = memory_get_usage();
 	
 	return $end - $start;
@@ -2018,7 +2018,7 @@ 
 	
 	
 	// bail early if no version (not activated)
-	if( !$acf_version ) {
+	if ( ! $acf_version) {
 		
 		return false;
 		
@@ -2026,19 +2026,19 @@ 
 	
 	
 	// check that path exists
-	if( !file_exists( $path ) ) {
+	if ( ! file_exists($path)) {
 	
 		return false;
 		
 	}
 	
 	
-	$dir = opendir( $path );
+	$dir = opendir($path);
 
-    while(false !== ( $file = readdir($dir)) ) {
+    while (false !== ($file = readdir($dir))) {
     
     	// only php files
-    	if( substr($file, -4) !== '.php' ) {
+    	if (substr($file, -4) !== '.php') {
     	
 	    	continue;
 	    	
@@ -2050,14 +2050,14 @@ 
     	
     	
     	// ignore if update is for a future version. May exist for testing
-		if( version_compare( $update_version, $plugin_version, '>') ) {
+		if (version_compare($update_version, $plugin_version, '>')) {
 		
 			continue;
 			
 		}
 		
 		// ignore if update has already been run
-		if( version_compare( $update_version, $acf_version, '<=') ) {
+		if (version_compare($update_version, $acf_version, '<=')) {
 		
 			continue;
 			
@@ -2089,10 +2089,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_encode_choices( $array = array() ) {
+function acf_encode_choices($array = array()) {
 	
 	// bail early if not array
-	if( !is_array($array) ) {
+	if ( ! is_array($array)) {
 		
 		return $array;
 		
@@ -2103,13 +2103,13 @@ 
 	$string = '';
 	
 	
-	if( !empty($array) ) {
+	if ( ! empty($array)) {
 		
-		foreach( $array as $k => $v ) { 
+		foreach ($array as $k => $v) { 
 			
-			if( $k !== $v ) {
+			if ($k !== $v) {
 				
-				$array[ $k ] = $k . ' : ' . $v;
+				$array[$k] = $k.' : '.$v;
 				
 			}
 			
@@ -2125,20 +2125,20 @@ 
 	
 }
 
-function acf_decode_choices( $string = '' ) {
+function acf_decode_choices($string = '') {
 	
 	// validate
-	if( $string === '') {
+	if ($string === '') {
 		
 		return array();
 		
 	// force array on single numeric values
-	} elseif( is_numeric($string) ) {
+	} elseif (is_numeric($string)) {
 		
 		// allow
 	
 	// bail early if not a a string
-	} elseif( !is_string($string) ) {
+	} elseif ( ! is_string($string)) {
 		
 		return $string;
 		
@@ -2154,7 +2154,7 @@ 
 	
 	
 	// key => value
-	foreach( $lines as $line ) {
+	foreach ($lines as $line) {
 		
 		// vars
 		$k = trim($line);
@@ -2162,7 +2162,7 @@ 
 		
 		
 		// look for ' : '
-		if( acf_str_exists(' : ', $line) ) {
+		if (acf_str_exists(' : ', $line)) {
 		
 			$line = explode(' : ', $line);
 			
@@ -2173,7 +2173,7 @@ 
 		
 		
 		// append
-		$array[ $k ] = $v;
+		$array[$k] = $v;
 		
 	}
 	
@@ -2201,30 +2201,30 @@ 
 acf_update_setting('php_to_js_date_formats', array(
 
 	// Year
-	'Y'	=> 'yy',	// Numeric, 4 digits 								1999, 2003
-	'y'	=> 'y',		// Numeric, 2 digits 								99, 03
+	'Y'	=> 'yy', // Numeric, 4 digits 								1999, 2003
+	'y'	=> 'y', // Numeric, 2 digits 								99, 03
 	
 	
 	// Month
-	'm'	=> 'mm',	// Numeric, with leading zeros  					01–12
-	'n'	=> 'm',		// Numeric, without leading zeros  					1–12
-	'F'	=> 'MM',	// Textual full   									January – December
-	'M'	=> 'M',		// Textual three letters    						Jan - Dec 
+	'm'	=> 'mm', // Numeric, with leading zeros  					01–12
+	'n'	=> 'm', // Numeric, without leading zeros  					1–12
+	'F'	=> 'MM', // Textual full   									January – December
+	'M'	=> 'M', // Textual three letters    						Jan - Dec 
 	
 	
 	// Weekday
-	'l'	=> 'DD',	// Full name  (lowercase 'L') 						Sunday – Saturday
-	'D'	=> 'D',		// Three letter name 	 							Mon – Sun 
+	'l'	=> 'DD', // Full name  (lowercase 'L') 						Sunday – Saturday
+	'D'	=> 'D', // Three letter name 	 							Mon – Sun 
 	
 	
 	// Day of Month
-	'd'	=> 'dd',	// Numeric, with leading zeros						01–31
-	'j'	=> 'd',		// Numeric, without leading zeros 					1–31
-	'S'	=> '',		// The English suffix for the day of the month  	st, nd or th in the 1st, 2nd or 15th. 
+	'd'	=> 'dd', // Numeric, with leading zeros						01–31
+	'j'	=> 'd', // Numeric, without leading zeros 					1–31
+	'S'	=> '', // The English suffix for the day of the month  	st, nd or th in the 1st, 2nd or 15th. 
 
 ));
 
-function acf_convert_date_to_php( $date ) {
+function acf_convert_date_to_php($date) {
 	
 	// vars
 	$ignore = array();
@@ -2235,10 +2235,10 @@ 
 	
 	
 	// loop over conversions
-	foreach( $php_to_js as $replace => $search ) {
+	foreach ($php_to_js as $replace => $search) {
 		
 		// ignore this replace?
-		if( in_array($search, $ignore) ) {
+		if (in_array($search, $ignore)) {
 			
 			continue;
 			
@@ -2272,7 +2272,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_convert_date_to_js( $date ) {
+function acf_convert_date_to_js($date) {
 	
 	// vars
 	$ignore = array();
@@ -2283,10 +2283,10 @@ 
 	
 	
 	// loop over conversions
-	foreach( $php_to_js as $search => $replace ) {
+	foreach ($php_to_js as $search => $replace) {
 		
 		// ignore this replace?
-		if( in_array($search, $ignore) ) {
+		if (in_array($search, $ignore)) {
 			
 			continue;
 			
@@ -2321,18 +2321,18 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_update_user_setting( $name, $value ) {
+function acf_update_user_setting($name, $value) {
 	
 	// get current user id
 	$user_id = get_current_user_id();
 	
 	
 	// get user settings
-	$settings = get_user_meta( $user_id, 'acf_user_settings', false );
+	$settings = get_user_meta($user_id, 'acf_user_settings', false);
 	
 	
 	// find settings
-	if( isset($settings[0]) ) {
+	if (isset($settings[0])) {
 	
 		$settings = $settings[0];
 	
@@ -2344,14 +2344,14 @@ 
 	
 	
 	// delete setting (allow 0 to save)
-	if( !$value && !is_numeric($value) ) {
+	if ( ! $value && ! is_numeric($value)) {
 		
-		unset($settings[ $name ]);
+		unset($settings[$name]);
 	
 	// append setting	
 	} else {
 		
-		$settings[ $name ] = $value;
+		$settings[$name] = $value;
 		
 	}
 	
@@ -2376,18 +2376,18 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_user_setting( $name = '', $default = false ) {
+function acf_get_user_setting($name = '', $default = false) {
 	
 	// get current user id
 	$user_id = get_current_user_id();
 	
 	
 	// get user settings
-	$settings = get_user_meta( $user_id, 'acf_user_settings', false );
+	$settings = get_user_meta($user_id, 'acf_user_settings', false);
 	
 	
 	// bail arly if no settings
-	if( !isset($settings[0][$name]) ) {
+	if ( ! isset($settings[0][$name])) {
 		
 		return $default;
 		
@@ -2413,10 +2413,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_in_array( $value, $array ) {
+function acf_in_array($value, $array) {
 	
 	// bail early if not array
-	if( !is_array($array) ) {
+	if ( ! is_array($array)) {
 		
 		return false;
 		
@@ -2442,10 +2442,10 @@ 
 *  @return	$post_id (mixed)
 */
 
-function acf_get_valid_post_id( $post_id = 0 ) {
+function acf_get_valid_post_id($post_id = 0) {
 	
 	// set post_id to global
-	if( !$post_id ) {
+	if ( ! $post_id) {
 	
 		$post_id = (int) get_the_ID();
 		
@@ -2453,7 +2453,7 @@ 
 	
 	
 	// allow for option == options
-	if( $post_id == 'option' ) {
+	if ($post_id == 'option') {
 	
 		$post_id = 'options';
 		
@@ -2461,21 +2461,21 @@ 
 	
 	
 	// $post_id may be an object
-	if( is_object($post_id) ) {
+	if (is_object($post_id)) {
 		
-		if( isset($post_id->roles, $post_id->ID) ) {
+		if (isset($post_id->roles, $post_id->ID)) {
 		
-			$post_id = 'user_' . $post_id->ID;
+			$post_id = 'user_'.$post_id->ID;
 			
-		} elseif( isset($post_id->taxonomy, $post_id->term_id) ) {
+		} elseif (isset($post_id->taxonomy, $post_id->term_id)) {
 		
-			$post_id = $post_id->taxonomy . '_' . $post_id->term_id;
+			$post_id = $post_id->taxonomy.'_'.$post_id->term_id;
 			
-		} elseif( isset($post_id->comment_ID) ) {
+		} elseif (isset($post_id->comment_ID)) {
 		
-			$post_id = 'comment_' . $post_id->comment_ID;
+			$post_id = 'comment_'.$post_id->comment_ID;
 			
-		} elseif( isset($post_id->ID) ) {
+		} elseif (isset($post_id->ID)) {
 		
 			$post_id = $post_id->ID;
 			
@@ -2485,14 +2485,14 @@ 
 	
 	
 	// append language code
-	if( $post_id == 'options' ) {
+	if ($post_id == 'options') {
 		
 		$dl = acf_get_setting('default_language');
 		$cl = acf_get_setting('current_language');
 		
-		if( $cl && $cl !== $dl ) {
+		if ($cl && $cl !== $dl) {
 			
-			$post_id .= '_' . $cl;
+			$post_id .= '_'.$cl;
 			
 		}
 		
@@ -2510,11 +2510,11 @@ 
 	*  the user wants to load data from a completely different post_id
 	*/
 	
-	if( isset($_GET['preview_id']) ) {
+	if (isset($_GET['preview_id'])) {
 	
-		$autosave = wp_get_post_autosave( $_GET['preview_id'] );
+		$autosave = wp_get_post_autosave($_GET['preview_id']);
 		
-		if( $autosave && $autosave->post_parent == $post_id ) {
+		if ($autosave && $autosave->post_parent == $post_id) {
 		
 			$post_id = (int) $autosave->ID;
 			
@@ -2542,7 +2542,7 @@ 
 *  @return	n/a
 */
 	
-function acf_upload_files( $ancestors = array() ) {
+function acf_upload_files($ancestors = array()) {
 	
 	// vars
 	$file = array(
@@ -2555,21 +2555,21 @@ 
 	
 	
 	// populate with $_FILES data
-	foreach( array_keys($file) as $k ) {
+	foreach (array_keys($file) as $k) {
 		
-		$file[ $k ] = $_FILES['acf'][ $k ];
+		$file[$k] = $_FILES['acf'][$k];
 		
 	}
 	
 	
 	// walk through ancestors
-	if( !empty($ancestors) ) {
+	if ( ! empty($ancestors)) {
 		
-		foreach( $ancestors as $a ) {
+		foreach ($ancestors as $a) {
 			
-			foreach( array_keys($file) as $k ) {
+			foreach (array_keys($file) as $k) {
 				
-				$file[ $k ] = $file[ $k ][ $a ];
+				$file[$k] = $file[$k][$a];
 				
 			}
 			
@@ -2579,13 +2579,13 @@ 
 	
 	
 	// is array?
-	if( is_array($file['name']) ) {
+	if (is_array($file['name'])) {
 		
-		foreach( array_keys($file['name']) as $k ) {
+		foreach (array_keys($file['name']) as $k) {
 				
 			$_ancestors = array_merge($ancestors, array($k));
 			
-			acf_upload_files( $_ancestors );
+			acf_upload_files($_ancestors);
 			
 		}
 		
@@ -2595,7 +2595,7 @@ 
 	
 	
 	// bail ealry if file has error (no file uploaded)
-	if( $file['error'] ) {
+	if ($file['error']) {
 		
 		return;
 		
@@ -2607,12 +2607,12 @@ 
 	
 	
 	// file found!
-	$attachment_id = acf_upload_file( $file );
+	$attachment_id = acf_upload_file($file);
 	
 	
 	// update $_POST
 	array_unshift($ancestors, 'acf');
-	acf_update_nested_array( $_POST, $ancestors, $attachment_id );
+	acf_update_nested_array($_POST, $ancestors, $attachment_id);
 	
 }
 
@@ -2630,24 +2630,24 @@ 
 *  @return	$id (int) new attachment ID
 */
 
-function acf_upload_file( $uploaded_file ) {
+function acf_upload_file($uploaded_file) {
 	
 	// required
-	require_once( ABSPATH . "/wp-load.php" );
-	require_once( ABSPATH . "/wp-admin/includes/file.php" );
-	require_once( ABSPATH . "/wp-admin/includes/image.php" );
+	require_once(ABSPATH."/wp-load.php");
+	require_once(ABSPATH."/wp-admin/includes/file.php");
+	require_once(ABSPATH."/wp-admin/includes/image.php");
 	 
 	 
 	// required for wp_handle_upload() to upload the file
-	$upload_overrides = array( 'test_form' => false );
+	$upload_overrides = array('test_form' => false);
 	
 	
 	// upload
-	$file = wp_handle_upload( $uploaded_file, $upload_overrides );
+	$file = wp_handle_upload($uploaded_file, $upload_overrides);
 	
 	
 	// bail ealry if upload failed
-	if( isset($file['error']) ) {
+	if (isset($file['error'])) {
 		
 		return $file['error'];
 		
@@ -2673,10 +2673,10 @@ 
 	$id = wp_insert_attachment($object, $file);
 
 	// Add the meta-data
-	wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $file));
 	
 	/** This action is documented in wp-admin/custom-header.php */
-	do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
+	do_action('wp_create_file_in_uploads', $file, $id); // For replication
 	
 	// return new ID
 	return $id;
@@ -2699,10 +2699,10 @@ 
 *  @return	(boolean)
 */
 
-function acf_update_nested_array( &$array, $ancestors, $value ) {
+function acf_update_nested_array(&$array, $ancestors, $value) {
 	
 	// if no more ancestors, update the current var
-	if( empty($ancestors) ) {
+	if (empty($ancestors)) {
 		
 		$array = $value;
 		
@@ -2713,13 +2713,13 @@ 
 	
 	
 	// shift the next ancestor from the array
-	$k = array_shift( $ancestors );
+	$k = array_shift($ancestors);
 	
 	
 	// if exists
-	if( isset($array[ $k ]) ) {
+	if (isset($array[$k])) {
 		
-		return acf_update_nested_array( $array[ $k ], $ancestors, $value );
+		return acf_update_nested_array($array[$k], $ancestors, $value);
 		
 	}
 		
@@ -2742,7 +2742,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_is_screen( $id = '' ) {
+function acf_is_screen($id = '') {
 	
 	// vars
 	$current_screen = get_current_screen();
@@ -2769,17 +2769,17 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_maybe_get( $array, $key, $default = null ) {
+function acf_maybe_get($array, $key, $default = null) {
 	
 	// vars
 	$keys = explode('/', $key);
 	
 	
 	// loop through keys
-	foreach( $keys as $k ) {
+	foreach ($keys as $k) {
 		
 		// return default if does not exist
-		if( !isset($array[ $k ]) ) {
+		if ( ! isset($array[$k])) {
 			
 			return $default;
 			
@@ -2787,7 +2787,7 @@ 
 		
 		
 		// update $array
-		$array = $array[ $k ];
+		$array = $array[$k];
 		
 	}
 	
@@ -2811,10 +2811,10 @@ 
 *  @return	(array)
 */
 
-function acf_get_attachment( $post ) {
+function acf_get_attachment($post) {
 	
 	// get post
-	if ( !$post = get_post( $post ) ) {
+	if ( ! $post = get_post($post)) {
 		
 		return false;
 		
@@ -2828,8 +2828,8 @@ 
 		'ID'			=> $id,
 		'id'			=> $id,
 		'title'       	=> $post->post_title,
-		'filename'    	=> wp_basename( $post->guid ),
-		'url'			=> wp_get_attachment_url( $id ),
+		'filename'    	=> wp_basename($post->guid),
+		'url'			=> wp_get_attachment_url($id),
 		'alt'			=> get_post_meta($id, '_wp_attachment_image_alt', true),
 		'author'		=> $post->post_author,
 		'description'	=> $post->post_content,
@@ -2838,28 +2838,28 @@ 
 		'date'			=> $post->post_date_gmt,
 		'modified'		=> $post->post_modified_gmt,
 		'mime_type'		=> $post->post_mime_type,
-		'type'			=> acf_maybe_get( explode('/', $post->post_mime_type), 0, '' ),
-		'icon'			=> wp_mime_type_icon( $id )
+		'type'			=> acf_maybe_get(explode('/', $post->post_mime_type), 0, ''),
+		'icon'			=> wp_mime_type_icon($id)
 	);
 	
 	
 	// video may use featured image
-	if( $a['type'] === 'image' ) {
+	if ($a['type'] === 'image') {
 		
 		$thumb_id = $id;
-		$src = wp_get_attachment_image_src( $id, 'full' );
+		$src = wp_get_attachment_image_src($id, 'full');
 		
 		$a['url'] = $src[0];
 		$a['width'] = $src[1];
 		$a['height'] = $src[2];
 		
 		
-	} elseif( $a['type'] === 'audio' || $a['type'] === 'video' ) {
+	} elseif ($a['type'] === 'audio' || $a['type'] === 'video') {
 		
 		// video dimentions
-		if( $a['type'] == 'video' ) {
+		if ($a['type'] == 'video') {
 			
-			$meta = wp_get_attachment_metadata( $id );
+			$meta = wp_get_attachment_metadata($id);
 			$a['width'] = acf_maybe_get($meta, 'width', 0);
 			$a['height'] = acf_maybe_get($meta, 'height', 0);
 		
@@ -2867,7 +2867,7 @@ 
 		
 		
 		// feature image
-		if( $featured_id = get_post_thumbnail_id($id) ) {
+		if ($featured_id = get_post_thumbnail_id($id)) {
 		
 			$thumb_id = $featured_id;
 			
@@ -2877,22 +2877,22 @@ 
 	
 	
 	// sizes
-	if( $thumb_id ) {
+	if ($thumb_id) {
 		
 		// find all image sizes
-		if( $sizes = get_intermediate_image_sizes() ) {
+		if ($sizes = get_intermediate_image_sizes()) {
 			
 			$a['sizes'] = array();
 			
-			foreach( $sizes as $size ) {
+			foreach ($sizes as $size) {
 				
 				// url
-				$src = wp_get_attachment_image_src( $thumb_id, $size );
+				$src = wp_get_attachment_image_src($thumb_id, $size);
 				
 				// add src
-				$a['sizes'][ $size ] = $src[0];
-				$a['sizes'][ $size . '-width' ] = $src[1];
-				$a['sizes'][ $size . '-height' ] = $src[2];
+				$a['sizes'][$size] = $src[0];
+				$a['sizes'][$size.'-width'] = $src[1];
+				$a['sizes'][$size.'-height'] = $src[2];
 				
 			}
 			
@@ -2921,19 +2921,19 @@ 
 *  @return	(string)
 */
 
-function acf_get_truncated( $text, $length = 64 ) {
+function acf_get_truncated($text, $length = 64) {
 	
 	// vars
 	$text = trim($text);
-	$the_length = strlen( $text );
+	$the_length = strlen($text);
 	
 	
 	// cut
-	$return = substr( $text, 0, ($length - 3) );
+	$return = substr($text, 0, ($length - 3));
 	
 	
 	// ...
-	if( $the_length > ($length - 3) ) {
+	if ($the_length > ($length - 3)) {
 	
 		$return .= '...';
 		
@@ -2986,13 +2986,13 @@ 
 	
 	
 	// handle sub folder
-	if( !empty($bits[3]) ) {
+	if ( ! empty($bits[3])) {
 		
-		$find = '/' . $bits[3];
+		$find = '/'.$bits[3];
 		$pos = strpos($url, $find);
 		$length = strlen($find);
 		
-		if( $pos !== false ) {
+		if ($pos !== false) {
 			
 		    $url = substr_replace($url, '', $pos, $length);
 		    
@@ -3022,7 +3022,7 @@ 
 
 function acf_current_user_can_admin() {
 	
-	if( acf_get_setting('show_admin') && current_user_can(acf_get_setting('capability')) ) {
+	if (acf_get_setting('show_admin') && current_user_can(acf_get_setting('capability'))) {
 		
 		return true;
 		
@@ -3048,7 +3048,7 @@ 
 *  @return	(int)
 */
 
-function acf_get_filesize( $size = 1 ) {
+function acf_get_filesize($size = 1) {
 	
 	// vars
 	$unit = 'MB';
@@ -3061,14 +3061,14 @@ 
 	
 	
 	// look for $unit within the $size parameter (123 KB)
-	if( is_string($size) ) {
+	if (is_string($size)) {
 		
 		// vars
-		$custom = strtoupper( substr($size, -2) );
+		$custom = strtoupper(substr($size, -2));
 		
-		foreach( $units as $k => $v ) {
+		foreach ($units as $k => $v) {
 			
-			if( $custom === $k ) {
+			if ($custom === $k) {
 				
 				$unit = $k;
 				$size = substr($size, 0, -2);
@@ -3103,10 +3103,10 @@ 
 *  @return	(int)
 */
 
-function acf_format_filesize( $size = 1 ) {
+function acf_format_filesize($size = 1) {
 	
 	// convert
-	$bytes = acf_get_filesize( $size );
+	$bytes = acf_get_filesize($size);
 	
 	
 	// vars
@@ -3119,13 +3119,13 @@ 
 	
 	
 	// loop through units
-	foreach( $units as $k => $v ) {
+	foreach ($units as $k => $v) {
 		
 		$result = $bytes / pow(1024, $v);
 		
-		if( $result >= 1 ) {
+		if ($result >= 1) {
 			
-			return $result . ' ' . $k;
+			return $result.' '.$k;
 			
 		}
 		
@@ -3133,7 +3133,7 @@ 
 	
 	
 	// return
-	return $bytes . ' B';
+	return $bytes.' B';
 		
 }
 
@@ -3152,10 +3152,10 @@ 
 *  @return	$terms
 */
 
-function acf_get_valid_terms( $terms = false, $taxonomy = 'category' ) {
+function acf_get_valid_terms($terms = false, $taxonomy = 'category') {
 	
 	// bail early if function does not yet exist or
-	if( !function_exists('wp_get_split_term') || empty($terms) ) {
+	if ( ! function_exists('wp_get_split_term') || empty($terms)) {
 		
 		return $terms;
 		
@@ -3167,7 +3167,7 @@ 
 	
 	
 	// force into array
-	$terms = acf_get_array( $terms );
+	$terms = acf_get_array($terms);
 	
 	
 	// force ints
@@ -3175,13 +3175,13 @@ 
 	
 	
 	// attempt to find new terms
-	foreach( $terms as $i => $term_id ) {
+	foreach ($terms as $i => $term_id) {
 		
 		$new_term_id = wp_get_split_term($term_id, $taxonomy);
 		
-		if( $new_term_id ) {
+		if ($new_term_id) {
 			
-			$terms[ $i ] = $new_term_id;
+			$terms[$i] = $new_term_id;
 			
 		}
 		
@@ -3189,7 +3189,7 @@ 
 	
 	
 	// revert array if needed
-	if( !$is_array ) {
+	if ( ! $is_array) {
 		
 		$terms = $terms[0];
 		
@@ -3264,7 +3264,7 @@ 
 *  @return	$errors (array)
 */
 
-function acf_validate_attachment( $attachment, $field, $context = 'prepare' ) {
+function acf_validate_attachment($attachment, $field, $context = 'prepare') {
 	
 	// vars
 	$errors = array();
@@ -3277,13 +3277,13 @@ 
 	
 	
 	// upload
-	if( $context == 'upload' ) {
+	if ($context == 'upload') {
 		
 		// vars
 		$file['type'] = pathinfo($attachment['name'], PATHINFO_EXTENSION);
 		$file['size'] = filesize($attachment['tmp_name']);
 		
-		if( strpos($attachment['type'], 'image') !== false ) {
+		if (strpos($attachment['type'], 'image') !== false) {
 			
 			$size = getimagesize($attachment['tmp_name']);
 			$file['width'] = acf_maybe_get($size, 0);
@@ -3292,7 +3292,7 @@ 
 		}
 	
 	// prepare
-	} elseif( $context == 'prepare' ) {
+	} elseif ($context == 'prepare') {
 		
 		$file['type'] = pathinfo($attachment['url'], PATHINFO_EXTENSION);
 		$file['size'] = acf_maybe_get($attachment, 'filesizeInBytes', 0);
@@ -3308,23 +3308,23 @@ 
 	
 	
 	// image
-	if( $file['width'] || $file['height'] ) {
+	if ($file['width'] || $file['height']) {
 		
 		// width
 		$min_width = (int) acf_maybe_get($field, 'min_width', 0);
 		$max_width = (int) acf_maybe_get($field, 'max_width', 0);
 		
-		if( $file['width'] ) {
+		if ($file['width']) {
 			
-			if( $min_width && $file['width'] < $min_width ) {
+			if ($min_width && $file['width'] < $min_width) {
 				
 				// min width
-				$errors['min_width'] = sprintf(__('Image width must be at least %dpx.', 'acf'), $min_width );
+				$errors['min_width'] = sprintf(__('Image width must be at least %dpx.', 'acf'), $min_width);
 				
-			} elseif( $max_width && $file['width'] > $max_width ) {
+			} elseif ($max_width && $file['width'] > $max_width) {
 				
 				// min width
-				$errors['max_width'] = sprintf(__('Image width must not exceed %dpx.', 'acf'), $max_width );
+				$errors['max_width'] = sprintf(__('Image width must not exceed %dpx.', 'acf'), $max_width);
 				
 			}
 			
@@ -3335,17 +3335,17 @@ 
 		$min_height = (int) acf_maybe_get($field, 'min_height', 0);
 		$max_height = (int) acf_maybe_get($field, 'max_height', 0);
 		
-		if( $file['height'] ) {
+		if ($file['height']) {
 			
-			if( $min_height && $file['height'] < $min_height ) {
+			if ($min_height && $file['height'] < $min_height) {
 				
 				// min height
-				$errors['min_height'] = sprintf(__('Image height must be at least %dpx.', 'acf'), $min_height );
+				$errors['min_height'] = sprintf(__('Image height must be at least %dpx.', 'acf'), $min_height);
 				
-			}  elseif( $max_height && $file['height'] > $max_height ) {
+			}  elseif ($max_height && $file['height'] > $max_height) {
 				
 				// min height
-				$errors['max_height'] = sprintf(__('Image height must not exceed %dpx.', 'acf'), $max_height );
+				$errors['max_height'] = sprintf(__('Image height must not exceed %dpx.', 'acf'), $max_height);
 				
 			}
 			
@@ -3355,20 +3355,20 @@ 
 	
 	
 	// file size
-	if( $file['size'] ) {
+	if ($file['size']) {
 		
 		$min_size = acf_maybe_get($field, 'min_size', 0);
 		$max_size = acf_maybe_get($field, 'max_size', 0);
 		
-		if( $min_size && $file['size'] < acf_get_filesize($min_size) ) {
+		if ($min_size && $file['size'] < acf_get_filesize($min_size)) {
 				
 			// min width
-			$errors['min_size'] = sprintf(__('File size must be at least %s.', 'acf'), acf_format_filesize($min_size) );
+			$errors['min_size'] = sprintf(__('File size must be at least %s.', 'acf'), acf_format_filesize($min_size));
 			
-		} elseif( $max_size && $file['size'] > acf_get_filesize($max_size) ) {
+		} elseif ($max_size && $file['size'] > acf_get_filesize($max_size)) {
 				
 			// min width
-			$errors['max_size'] = sprintf(__('File size must must not exceed %s.', 'acf'), acf_format_filesize($max_size) );
+			$errors['max_size'] = sprintf(__('File size must must not exceed %s.', 'acf'), acf_format_filesize($max_size));
 			
 		}
 	
@@ -3376,7 +3376,7 @@ 
 	
 	
 	// file type
-	if( $file['type'] ) {
+	if ($file['type']) {
 		
 		$mime_types = acf_maybe_get($field, 'mime_types', '');
 		
@@ -3390,19 +3390,19 @@ 
 		$mime_types = explode(',', $mime_types); // split pieces
 		$mime_types = array_filter($mime_types); // remove empty pieces
 		
-		if( !empty($mime_types) && !in_array($file['type'], $mime_types) ) {
+		if ( ! empty($mime_types) && ! in_array($file['type'], $mime_types)) {
 			
 			// glue together last 2 types
-			if( count($mime_types) > 1 ) {
+			if (count($mime_types) > 1) {
 				
 				$last1 = array_pop($mime_types);
 				$last2 = array_pop($mime_types);
 				
-				$mime_types[] = $last2 . ' ' . __('or', 'acf') . ' ' . $last1;
+				$mime_types[] = $last2.' '.__('or', 'acf').' '.$last1;
 				
 			}
 			
-			$errors['mime_types'] = sprintf(__('File type must be %s.', 'acf'), implode(', ', $mime_types) );
+			$errors['mime_types'] = sprintf(__('File type must be %s.', 'acf'), implode(', ', $mime_types));
 			
 		}
 				
@@ -3411,9 +3411,9 @@ 
 	
 	// filter for 3rd party customization
 	$errors = apply_filters("acf/validate_attachment", $errors, $file, $attachment, $field);
-	$errors = apply_filters("acf/validate_attachment/type={$field['type']}", $errors, $file, $attachment, $field );
-	$errors = apply_filters("acf/validate_attachment/name={$field['name']}", $errors, $file, $attachment, $field );
-	$errors = apply_filters("acf/validate_attachment/key={$field['key']}", $errors, $file, $attachment, $field );
+	$errors = apply_filters("acf/validate_attachment/type={$field['type']}", $errors, $file, $attachment, $field);
+	$errors = apply_filters("acf/validate_attachment/name={$field['name']}", $errors, $file, $attachment, $field);
+	$errors = apply_filters("acf/validate_attachment/key={$field['key']}", $errors, $file, $attachment, $field);
 	
 	
 	// return
@@ -3437,10 +3437,10 @@ 
 
 add_filter('acf/settings/uploader', '_acf_settings_uploader');
 
-function _acf_settings_uploader( $uploader ) {
+function _acf_settings_uploader($uploader) {
 	
 	// if can't upload files
-	if( !current_user_can('upload_files') ) {
+	if ( ! current_user_can('upload_files')) {
 		
 		$uploader = 'basic';
 		
@@ -3465,21 +3465,21 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_translate_keys( $array, $keys ) {
+function acf_translate_keys($array, $keys) {
 	
 	// bail early if no keys
-	if( empty($keys) ) return $array;
+	if (empty($keys)) return $array;
 	
 	
 	// translate
-	foreach( $keys as $k ) {
+	foreach ($keys as $k) {
 		
 		// bail ealry if not exists
-		if( !isset($array[ $k ]) ) continue;
+		if ( ! isset($array[$k])) continue;
 		
 		
 		// translate
-		$array[ $k ] = acf_translate( $array[ $k ] );
+		$array[$k] = acf_translate($array[$k]);
 		
 	}
 	
@@ -3504,18 +3504,18 @@ 
 *  @return	$string
 */
 
-function acf_translate( $string ) {
+function acf_translate($string) {
 	
 	// bail early if not enabled
-	if( !acf_get_setting('l10n') ) return $string;
+	if ( ! acf_get_setting('l10n')) return $string;
 	
 	
 	// bail early if no textdomain
-	if( !acf_get_setting('l10n_textdomain') ) return $string;
+	if ( ! acf_get_setting('l10n_textdomain')) return $string;
 	
 	
 	// is array
-	if( is_array($string) ) {
+	if (is_array($string)) {
 		
 		return array_map('acf_translate', $string);
 		
@@ -3523,23 +3523,23 @@ 
 	
 	
 	// bail early if not string
-	if( !is_string($string) ) return $string;
+	if ( ! is_string($string)) return $string;
 	
 	
 	// bail early if empty
-	if( $string === '' ) return $string;
+	if ($string === '') return $string;
 	
 	
 	// allow for var_export export
-	if( acf_get_setting('l10n_var_export') ){
+	if (acf_get_setting('l10n_var_export')) {
 		
-		return "!!__(!!'" .  $string . "!!', !!'" . acf_get_setting('l10n_textdomain') . "!!')!!";
+		return "!!__(!!'".$string."!!', !!'".acf_get_setting('l10n_textdomain')."!!')!!";
 			
 	}
 	
 	
 	// vars
-	return __( $string, acf_get_setting('l10n_textdomain') );
+	return __($string, acf_get_setting('l10n_textdomain'));
 	
 }
 
@@ -3557,17 +3557,17 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_maybe_add_action( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+function acf_maybe_add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	
 	// if action has already run, execute it
-	if( did_action($tag) ) {
+	if (did_action($tag)) {
 			
-		call_user_func( $function_to_add );
+		call_user_func($function_to_add);
 	
 	// if action has not yet run, add it
 	} else {
 		
-		add_action( $tag, $function_to_add, $priority, $accepted_args );
+		add_action($tag, $function_to_add, $priority, $accepted_args);
 		
 	}
 	
@@ -3589,7 +3589,7 @@ 
 
 add_filter("acf/settings/slug", '_acf_settings_slug');
 
-function _acf_settings_slug( $v ) {
+function _acf_settings_slug($v) {
 	
 	$basename = acf_get_setting('basename');
     $slug = explode('/', $basename);

Braces +26 added lines, -10 removed lines

@@ -123,7 +123,9 @@ 
 	
 	
 	// return true if already done
-	if( acf_get_setting($setting) ) return true;
+	if( acf_get_setting($setting) ) {
+		return true;
+	}
 	
 	
 	// update setting
@@ -1105,7 +1107,9 @@ 
 		
 		
 		// bail early i no terms
-		if( empty($terms) ) continue;
+		if( empty($terms) ) {
+			continue;
+		}
 		
 		
 		// sort into hierachial order!
@@ -1957,7 +1961,7 @@ 
 				
 				$arg = $arg ? 'true' : 'false';
 				
-			}elseif( is_string($arg) ) {
+			} elseif( is_string($arg) ) {
 				
 				$arg = '"' . $arg . '"';
 				
@@ -3342,7 +3346,7 @@ 
 				// min height
 				$errors['min_height'] = sprintf(__('Image height must be at least %dpx.', 'acf'), $min_height );
 				
-			}  elseif( $max_height && $file['height'] > $max_height ) {
+			} elseif( $max_height && $file['height'] > $max_height ) {
 				
 				// min height
 				$errors['max_height'] = sprintf(__('Image height must not exceed %dpx.', 'acf'), $max_height );
@@ -3468,14 +3472,18 @@ 
 function acf_translate_keys( $array, $keys ) {
 	
 	// bail early if no keys
-	if( empty($keys) ) return $array;
+	if( empty($keys) ) {
+		return $array;
+	}
 	
 	
 	// translate
 	foreach( $keys as $k ) {
 		
 		// bail ealry if not exists
-		if( !isset($array[ $k ]) ) continue;
+		if( !isset($array[ $k ]) ) {
+			continue;
+		}
 		
 		
 		// translate
@@ -3507,11 +3515,15 @@ 
 function acf_translate( $string ) {
 	
 	// bail early if not enabled
-	if( !acf_get_setting('l10n') ) return $string;
+	if( !acf_get_setting('l10n') ) {
+		return $string;
+	}
 	
 	
 	// bail early if no textdomain
-	if( !acf_get_setting('l10n_textdomain') ) return $string;
+	if( !acf_get_setting('l10n_textdomain') ) {
+		return $string;
+	}
 	
 	
 	// is array
@@ -3523,11 +3535,15 @@ 
 	
 	
 	// bail early if not string
-	if( !is_string($string) ) return $string;
+	if( !is_string($string) ) {
+		return $string;
+	}
 	
 	
 	// bail early if empty
-	if( $string === '' ) return $string;
+	if( $string === '' ) {
+		return $string;
+	}
 	
 	
 	// allow for var_export export