rousnay / lighthouse

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

includes/acf/api/api-template.php

Doc Comments +6 added lines

@@ -15,6 +15,9 @@ 
 *  @return	$reference (string)	a string containing the field_key
 */
 
+/**
+ * @return string
+ */
 function acf_get_field_reference( $field_name, $post_id ) {
 	
 	// try cache
@@ -857,6 +860,9 @@ 
 *  @return	(array)	
 */
 
+/**
+ * @param string $selector
+ */
 function get_sub_field_object( $selector, $format_value = true, $load_value = true ) {
 	
 	// vars

Indentation +10 added lines, -10 removed lines

@@ -994,23 +994,23 @@
 	if( acf_verify_nonce('acf_form') ) {
 		
 		// validate data
-	    if( acf_validate_save_post(true) ) {
+		if( acf_validate_save_post(true) ) {
 	    	
-	    	// form
-	    	$GLOBALS['acf_form'] = acf_extract_var($_POST, '_acf_form');
-	    	$GLOBALS['acf_form'] = @json_decode(base64_decode($GLOBALS['acf_form']), true);
+			// form
+			$GLOBALS['acf_form'] = acf_extract_var($_POST, '_acf_form');
+			$GLOBALS['acf_form'] = @json_decode(base64_decode($GLOBALS['acf_form']), true);
 	    	
 	    	
-	    	// validate
-	    	if( empty($GLOBALS['acf_form']) ) {
+			// validate
+			if( empty($GLOBALS['acf_form']) ) {
 		    	
-		    	return;
+				return;
 		    	
-	    	}
+			}
 	    	
 	    	
-	    	// vars
-	    	$post_id = acf_maybe_get( $GLOBALS['acf_form'], 'post_id', 0 );
+			// vars
+			$post_id = acf_maybe_get( $GLOBALS['acf_form'], 'post_id', 0 );
 			
 			
 			// allow for custom save

Spacing +255 added lines, -255 removed lines

@@ -15,13 +15,13 @@ 
 *  @return	$reference (string)	a string containing the field_key
 */
 
-function acf_get_field_reference( $field_name, $post_id ) {
+function acf_get_field_reference($field_name, $post_id) {
 	
 	// try cache
 	$found = false;
-	$cache = wp_cache_get( "field_reference/post_id={$post_id}/name={$field_name}", 'acf', false, $found );
+	$cache = wp_cache_get("field_reference/post_id={$post_id}/name={$field_name}", 'acf', false, $found);
 	
-	if( $found ) {
+	if ($found) {
 		
 		return $cache;
 		
@@ -29,11 +29,11 @@ 
 			
 	
 	// get reference
-	$reference = acf_get_metadata( $post_id, $field_name, true );
+	$reference = acf_get_metadata($post_id, $field_name, true);
 	
 	
 	//update cache
-	wp_cache_set( "field_reference/post_id={$post_id}/name={$field_name}", $reference, 'acf' );
+	wp_cache_set("field_reference/post_id={$post_id}/name={$field_name}", $reference, 'acf');
 	
 	
 	// return
@@ -56,13 +56,13 @@ 
 *  @return	n/a
 */
 
-function the_field( $selector, $post_id = false, $format_value = true ) {
+function the_field($selector, $post_id = false, $format_value = true) {
 	
 	$value = get_field($selector, $post_id, $format_value);
 	
-	if( is_array($value) ) {
+	if (is_array($value)) {
 		
-		$value = @implode( ', ', $value );
+		$value = @implode(', ', $value);
 		
 	}
 	
@@ -88,18 +88,18 @@ 
 *  @return	(mixed)
 */
  
-function get_field( $selector, $post_id = false, $format_value = true ) {
+function get_field($selector, $post_id = false, $format_value = true) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// create dummy field
-	if( !$field ) {
+	if ( ! $field) {
 		
 		$field = acf_get_valid_field(array(
 			'name'	=> $selector,
@@ -115,14 +115,14 @@ 
 	
 	
 	// get value for field
-	$value = acf_get_value( $post_id, $field );
+	$value = acf_get_value($post_id, $field);
 	
 	
 	// format value
-	if( $format_value ) {
+	if ($format_value) {
 		
 		// get value for field
-		$value = acf_format_value( $value, $post_id, $field );
+		$value = acf_format_value($value, $post_id, $field);
 		
 	}
 	
@@ -149,26 +149,26 @@ 
 *  @return	$field (array)
 */
 
-function get_field_object( $selector, $post_id = false, $format_value = true, $load_value = true ) {
+function get_field_object($selector, $post_id = false, $format_value = true, $load_value = true) {
 	
 	// compatibilty
-	if( is_array($format_value) ) {
+	if (is_array($format_value)) {
 		
-		extract( $format_value );
+		extract($format_value);
 		
 	}
 	
 	
 	// get valid post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field key
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// bail early if no field found
-	if( !$field ) {
+	if ( ! $field) {
 		
 		return false;
 		
@@ -176,18 +176,18 @@ 
 	
 	
 	// load value
-	if( $load_value ) {
+	if ($load_value) {
 	
-		$field['value'] = acf_get_value( $post_id, $field );
+		$field['value'] = acf_get_value($post_id, $field);
 		
 	}
 	
 	
 	// format value
-	if( $format_value ) {
+	if ($format_value) {
 		
 		// get value for field
-		$field['value'] = acf_format_value( $field['value'], $post_id, $field );
+		$field['value'] = acf_format_value($field['value'], $post_id, $field);
 		
 	}
 	
@@ -213,19 +213,19 @@ 
 *  @return	(array)	associative array where field name => field value
 */
 
-function get_fields( $post_id = false, $format_value = true ) {
+function get_fields($post_id = false, $format_value = true) {
 	
 	// vars
-	$fields = get_field_objects( $post_id, $format_value );
+	$fields = get_field_objects($post_id, $format_value);
 	$return = array();
 	
 	
 	// populate
-	if( is_array($fields) ) {
+	if (is_array($fields)) {
 		
-		foreach( $fields as $k => $field ) {
+		foreach ($fields as $k => $field) {
 		
-			$return[ $k ] = $field['value'];
+			$return[$k] = $field['value'];
 			
 		}
 		
@@ -253,14 +253,14 @@ 
 *  @return	(array)	associative array where field name => field
 */
 
-function get_field_objects( $post_id = false, $format_value = true, $load_value = true ) {
+function get_field_objects($post_id = false, $format_value = true, $load_value = true) {
 	
 	// global
 	global $wpdb;
 	
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 
 
 	// vars
@@ -269,35 +269,35 @@ 
 	
 				
 	// get field_names
-	if( is_numeric($post_id) ) {
+	if (is_numeric($post_id)) {
 		
-		$meta = get_post_meta( $post_id );
+		$meta = get_post_meta($post_id);
 	
-	} elseif( strpos($post_id, 'user_') !== false ) {
+	} elseif (strpos($post_id, 'user_') !== false) {
 		
 		$user_id = (int) str_replace('user_', '', $post_id);
 		
-		$meta = get_user_meta( $user_id );
+		$meta = get_user_meta($user_id);
 		
-	} elseif( strpos($post_id, 'comment_') !== false ) {
+	} elseif (strpos($post_id, 'comment_') !== false) {
 		
 		$comment_id = (int) str_replace('comment_', '', $post_id);
 		
-		$meta = get_comment_meta( $comment_id );
+		$meta = get_comment_meta($comment_id);
 		
 	} else {
 		
 		$rows = $wpdb->get_results($wpdb->prepare(
 			"SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE %s OR option_name LIKE %s",
-			$post_id . '_%' ,
-			'_' . $post_id . '_%' 
+			$post_id.'_%',
+			'_'.$post_id.'_%' 
 		), ARRAY_A);
 		
-		if( !empty($rows) ) {
+		if ( ! empty($rows)) {
 			
-			foreach( $rows as $row ) {
+			foreach ($rows as $row) {
 				
-				$meta[ $row['option_name'] ][] = $row['option_value'];
+				$meta[$row['option_name']][] = $row['option_value'];
 				
 			}
 			
@@ -307,7 +307,7 @@ 
 	
 	
 	// bail early if no meta
-	if( empty($meta) ) {
+	if (empty($meta)) {
 		
 		return false;
 		
@@ -315,10 +315,10 @@ 
 	
 	
 	// populate vars
-	foreach( $meta as $k => $v ) {
+	foreach ($meta as $k => $v) {
 		
 		// Hopefuly improve efficiency: bail early if $k does start with an '_'
-		if( $k[0] === '_' ) {
+		if ($k[0] === '_') {
 			
 			continue;
 			
@@ -326,7 +326,7 @@ 
 		
 		
 		// does a field key exist for this value?
-		if( !array_key_exists("_{$k}", $meta) ) {
+		if ( ! array_key_exists("_{$k}", $meta)) {
 			
 			continue;
 			
@@ -335,11 +335,11 @@ 
 		
 		// get field
 		$field_key = $meta["_{$k}"][0];
-		$field = acf_get_field( $field_key );
+		$field = acf_get_field($field_key);
 		
 		
 		// bail early if not a parent field
-		if( !$field || acf_is_sub_field($field) ) {
+		if ( ! $field || acf_is_sub_field($field)) {
 			
 			continue;
 			
@@ -347,30 +347,30 @@ 
 		
 		
 		// load value
-		if( $load_value ) {
+		if ($load_value) {
 		
-			$field['value'] = acf_get_value( $post_id, $field );
+			$field['value'] = acf_get_value($post_id, $field);
 			
 		}
 		
 		
 		// format value
-		if( $format_value ) {
+		if ($format_value) {
 			
 			// get value for field
-			$field['value'] = acf_format_value( $field['value'], $post_id, $field );
+			$field['value'] = acf_format_value($field['value'], $post_id, $field);
 			
 		}
 		
 					
 		// append to $value
-		$fields[ $field['name'] ] = $field;
+		$fields[$field['name']] = $field;
 		
 	}
  	
  	 	
 	// no value
-	if( empty($fields) ) {
+	if (empty($fields)) {
 	
 		return false;
 	
@@ -397,7 +397,7 @@ 
 *  @return	(boolean)
 */
 
-function have_rows( $selector, $post_id = false ) {
+function have_rows($selector, $post_id = false) {
 	
 	// vars
 	$row = array();
@@ -412,14 +412,14 @@ 
 	
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// empty?
-	if( empty($GLOBALS['acf_field']) ) {
+	if (empty($GLOBALS['acf_field'])) {
 		
 		// reset
-		reset_rows( true );
+		reset_rows(true);
 		
 		
 		// create a new loop
@@ -428,17 +428,17 @@ 
 	} else {
 		
 		// vars
-		$row = end( $GLOBALS['acf_field'] );
-		$prev = prev( $GLOBALS['acf_field'] );
+		$row = end($GLOBALS['acf_field']);
+		$prev = prev($GLOBALS['acf_field']);
 		$change = false;
 		
 		
 		// detect change
-		if( $post_id != $row['post_id'] ) {
+		if ($post_id != $row['post_id']) {
 			
 			$change = 'post_id';
 				
-		} elseif( $selector != $row['selector'] ) {
+		} elseif ($selector != $row['selector']) {
 			
 			$change = 'selector';
 				
@@ -446,13 +446,13 @@ 
 		
 		
 		// attempt to find sub field
-		if( $change ) {
+		if ($change) {
 			
 			$sub_field = acf_get_sub_field($selector, $row['field']);
 			
-			if( $sub_field ) {
+			if ($sub_field) {
 				
-				$sub_exists = isset($row['value'][ $row['i'] ][ $sub_field['key'] ]);
+				$sub_exists = isset($row['value'][$row['i']][$sub_field['key']]);
 				
 			}
 			
@@ -460,15 +460,15 @@ 
 		
 		
 		// If post_id has changed, this is most likely an archive loop
-		if( $change == 'post_id' ) {
+		if ($change == 'post_id') {
 			
-			if( empty($_post_id) && $sub_exists ) {
+			if (empty($_post_id) && $sub_exists) {
 				
 				// case: Change in $post_id was due to this being a nested loop and not specifying the $post_id
 				// action: move down one level into a new loop
 				$new_child_loop = true;
 			
-			} elseif( $prev && $prev['post_id'] == $post_id ) {
+			} elseif ($prev && $prev['post_id'] == $post_id) {
 				
 				// case: Change in $post_id was due to a nested loop ending
 				// action: move up one level through the loops
@@ -482,15 +482,15 @@ 
 				
 			}
 			
-		} elseif( $change == 'selector' ) {
+		} elseif ($change == 'selector') {
 			
-			if( $prev && $prev['selector'] == $selector && $prev['post_id'] == $post_id ) {
+			if ($prev && $prev['selector'] == $selector && $prev['post_id'] == $post_id) {
 				
 				// case: Change in $field_name was due to a nested loop ending
 				// action: move up one level through the loops
 				reset_rows();
 				
-			} elseif( $sub_exists ) {
+			} elseif ($sub_exists) {
 				
 				// case: Change in $field_name was due to this being a nested loop
 				// action: move down one level into a new loop
@@ -509,11 +509,11 @@ 
 	}
 	
 	
-	if( $new_parent_loop ) {
+	if ($new_parent_loop) {
 		
 		// vars
-		$field = get_field_object( $selector, $post_id, false );
-		$value = acf_extract_var( $field, 'value' );
+		$field = get_field_object($selector, $post_id, false);
+		$value = acf_extract_var($field, 'value');
 		
 		
 		// add row
@@ -526,14 +526,14 @@ 
 			'post_id'	=> $post_id,
 		);
 		
-	} elseif( $new_child_loop ) {
+	} elseif ($new_child_loop) {
 		
 		// vars
-		$value = $row['value'][ $row['i'] ][ $sub_field['key'] ];
+		$value = $row['value'][$row['i']][$sub_field['key']];
 		
 		$GLOBALS['acf_field'][] = array(
 			'selector'	=> $selector,
-			'name'		=> $row['name'] . '_' . $row['i'], // used by update_sub_field
+			'name'		=> $row['name'].'_'.$row['i'], // used by update_sub_field
 			'value'		=> $value,
 			'field'		=> $sub_field,
 			'i'			=> -1,
@@ -544,12 +544,12 @@ 
 	
 	
 	// update vars
-	$row = end( $GLOBALS['acf_field'] );
+	$row = end($GLOBALS['acf_field']);
 	
 	
 	
 	// return true if next row exists
-	if( is_array($row['value']) && array_key_exists($row['i']+1, $row['value']) ) {
+	if (is_array($row['value']) && array_key_exists($row['i'] + 1, $row['value'])) {
 		
 		return true;
 		
@@ -579,29 +579,29 @@ 
 *  @return	(array) the current row data
 */
 
-function the_row( $format = false ) {
+function the_row($format = false) {
 	
 	// vars
 	$depth = count($GLOBALS['acf_field']) - 1;
 
 	
 	// increase i of current row
-	$GLOBALS['acf_field'][ $depth ]['i']++;
+	$GLOBALS['acf_field'][$depth]['i']++;
 	
 	
 	// return
-	return get_row( $format );
+	return get_row($format);
 	
 }
 
-function get_row( $format = false ) {
+function get_row($format = false) {
 	
 	// vars
 	$row = acf_get_row();
 	
 	
 	// bail early if no row
-	if( !$row ) {
+	if ( ! $row) {
 		
 		return false;
 		
@@ -609,17 +609,17 @@ 
 	
 	
 	// get value
-	$value = $row['value'][ $row['i'] ];
+	$value = $row['value'][$row['i']];
 	
 	
 	// format
-	if( $format ) {
+	if ($format) {
 		
 		// temp wrap value in array
-		$value = array( $value );
+		$value = array($value);
 		
 		// format the value (1 row of data)
-		$value = acf_format_value( $value, $row['post_id'], $row['field'] );
+		$value = acf_format_value($value, $row['post_id'], $row['field']);
 		
 		// extract value from array
 		$value = $value[0];
@@ -635,9 +635,9 @@ 
 function acf_get_row() {
 	
 	// check and return row
-	if( !empty($GLOBALS['acf_field']) ) {
+	if ( ! empty($GLOBALS['acf_field'])) {
 		
-		return end( $GLOBALS['acf_field'] );
+		return end($GLOBALS['acf_field']);
 		
 	}
 	
@@ -654,7 +654,7 @@ 
 	
 	
 	// bail early if no row
-	if( !$row ) return 0;
+	if ( ! $row) return 0;
 	
 	
 	// return
@@ -677,21 +677,21 @@ 
 *  @return	(boolean)
 */
 
-function reset_rows( $hard_reset = false ) {
+function reset_rows($hard_reset = false) {
 	
 	// completely destroy?
-	if( $hard_reset )
+	if ($hard_reset)
 	{
 		$GLOBALS['acf_field'] = array();
 	}
 	else
 	{
 		// vars
-		$depth = count( $GLOBALS['acf_field'] ) - 1;
+		$depth = count($GLOBALS['acf_field']) - 1;
 		
 		
 		// remove
-		unset( $GLOBALS['acf_field'][$depth] );
+		unset($GLOBALS['acf_field'][$depth]);
 		
 		
 		// refresh index
@@ -722,14 +722,14 @@ 
 *  @return	(boolean)
 */
 
-function has_sub_field( $field_name, $post_id = false ) {
+function has_sub_field($field_name, $post_id = false) {
 	
 	// vars
-	$r = have_rows( $field_name, $post_id );
+	$r = have_rows($field_name, $post_id);
 	
 	
 	// if has rows, progress through 1 row for the while loop to work
-	if( $r ) {
+	if ($r) {
 		
 		the_row();
 		
@@ -741,9 +741,9 @@ 
 	
 }
 
-function has_sub_fields( $field_name, $post_id = false ) {
+function has_sub_fields($field_name, $post_id = false) {
 	
-	return has_sub_field( $field_name, $post_id );
+	return has_sub_field($field_name, $post_id);
 	
 }
 
@@ -761,14 +761,14 @@ 
 *  @return	(mixed)
 */
 
-function get_sub_field( $selector, $format_value = true ) {
+function get_sub_field($selector, $format_value = true) {
 	
 	// vars
 	$row = acf_get_row();
 	
 	
 	// bail early if no row
-	if( !$row ) {
+	if ( ! $row) {
 		
 		return false;
 		
@@ -780,7 +780,7 @@ 
 	
 	
 	// update selector
-	if( $sub_field ) {
+	if ($sub_field) {
 		
 		$selector = $sub_field['key'];
 		
@@ -792,16 +792,16 @@ 
 	
 	
 	// return value
-	if( isset($row['value'][ $row['i'] ][ $selector ]) ) {
+	if (isset($row['value'][$row['i']][$selector])) {
 		
 		// get
-		$value = $row['value'][ $row['i'] ][ $selector ];
+		$value = $row['value'][$row['i']][$selector];
 		
 		
 		// format
-		if( $format_value ) {
+		if ($format_value) {
 			
-			$value = acf_format_value( $value, $row['post_id'], $sub_field );
+			$value = acf_format_value($value, $row['post_id'], $sub_field);
 			
 		}
 		
@@ -830,13 +830,13 @@ 
 *  @return	n/a
 */
 
-function the_sub_field( $field_name, $format_value = true ) {
+function the_sub_field($field_name, $format_value = true) {
 	
-	$value = get_sub_field( $field_name, $format_value );
+	$value = get_sub_field($field_name, $format_value);
 	
-	if( is_array($value) ) {
+	if (is_array($value)) {
 		
-		$value = implode(', ',$value);
+		$value = implode(', ', $value);
 		
 	}
 	
@@ -857,14 +857,14 @@ 
 *  @return	(array)	
 */
 
-function get_sub_field_object( $selector, $format_value = true, $load_value = true ) {
+function get_sub_field_object($selector, $format_value = true, $load_value = true) {
 	
 	// vars
 	$row = acf_get_row();
 	
 	
 	// bail early if no row
-	if( !$row ) {
+	if ( ! $row) {
 		
 		return false;
 		
@@ -876,11 +876,11 @@ 
 
 	
 	// get sub field
-	$sub_field = acf_get_sub_field( $selector, $parent );
+	$sub_field = acf_get_sub_field($selector, $parent);
 	
 	
 	// bail early if no sub field
-	if( !$sub_field ) {
+	if ( ! $sub_field) {
 		
 		return false;
 		
@@ -888,9 +888,9 @@ 
 	
 	
 	// load value
-	if( $load_value ) {
+	if ($load_value) {
 	
-		$sub_field['value'] = get_sub_field( $sub_field['name'], $format_value );
+		$sub_field['value'] = get_sub_field($sub_field['name'], $format_value);
 		
 	}
 	
@@ -921,7 +921,7 @@ 
 	
 	
 	// return
-	if( isset($row['acf_fc_layout']) ) {
+	if (isset($row['acf_fc_layout'])) {
 		
 		return $row['acf_fc_layout'];
 		
@@ -950,29 +950,29 @@ 
 *  @return	(string)
 */
 
-function acf_shortcode( $atts )
+function acf_shortcode($atts)
 {
 	// extract attributs
-	extract( shortcode_atts( array(
+	extract(shortcode_atts(array(
 		'field'			=> '',
 		'post_id'		=> false,
 		'format_value'	=> true
-	), $atts ) );
+	), $atts));
 	
 	
 	// get value and return it
-	$value = get_field( $field, $post_id, $format_value );
+	$value = get_field($field, $post_id, $format_value);
 	
 	
-	if( is_array($value) )
+	if (is_array($value))
 	{
-		$value = @implode( ', ', $value );
+		$value = @implode(', ', $value);
 	}
 	
 	
 	return $value;
 }
-add_shortcode( 'acf', 'acf_shortcode' );
+add_shortcode('acf', 'acf_shortcode');
 
 
 /*
@@ -991,10 +991,10 @@ 
 function acf_form_head() {
 	
 	// verify nonce
-	if( acf_verify_nonce('acf_form') ) {
+	if (acf_verify_nonce('acf_form')) {
 		
 		// validate data
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    	
 	    	// form
 	    	$GLOBALS['acf_form'] = acf_extract_var($_POST, '_acf_form');
@@ -1002,7 +1002,7 @@ 
 	    	
 	    	
 	    	// validate
-	    	if( empty($GLOBALS['acf_form']) ) {
+	    	if (empty($GLOBALS['acf_form'])) {
 		    	
 		    	return;
 		    	
@@ -1010,7 +1010,7 @@ 
 	    	
 	    	
 	    	// vars
-	    	$post_id = acf_maybe_get( $GLOBALS['acf_form'], 'post_id', 0 );
+	    	$post_id = acf_maybe_get($GLOBALS['acf_form'], 'post_id', 0);
 			
 			
 			// allow for custom save
@@ -1018,22 +1018,22 @@ 
 			
 			
 			// save
-			acf_save_post( $post_id );
+			acf_save_post($post_id);
 			
 			
 			// vars
-			$return = acf_maybe_get( $GLOBALS['acf_form'], 'return', '' );
+			$return = acf_maybe_get($GLOBALS['acf_form'], 'return', '');
 			
 			
 			// redirect
-			if( $return ) {
+			if ($return) {
 				
 				// update %placeholders%
 				$return = str_replace('%post_url%', get_permalink($post_id), $return);
 				
 				
 				// redirect
-				wp_redirect( $return );
+				wp_redirect($return);
 				exit;
 			}
 			
@@ -1068,7 +1068,7 @@ 
 function _validate_save_post() {
 	
 	// save post_title
-	if( isset($_POST['acf']['_post_title']) ) {
+	if (isset($_POST['acf']['_post_title'])) {
 		
 		// get field
 		$field = acf_get_valid_field(array(
@@ -1080,7 +1080,7 @@ 
 		
 		
 		// validate
-		acf_validate_value( $_POST['acf']['_post_title'], $field, "acf[_post_title]" );
+		acf_validate_value($_POST['acf']['_post_title'], $field, "acf[_post_title]");
 	
 	}
 	
@@ -1102,7 +1102,7 @@ 
 
 add_filter('acf/pre_save_post', '_acf_pre_save_post', 0, 2);
 
-function _acf_pre_save_post( $post_id, $form ) {
+function _acf_pre_save_post($post_id, $form) {
 	
 	// vars
 	$save = array(
@@ -1111,15 +1111,15 @@ 
 	
 	
 	// determine save data
-	if( is_numeric($post_id) ) {
+	if (is_numeric($post_id)) {
 		
 		// update post
 		$save['ID'] = $post_id;
 		
-	} elseif( $post_id == 'new_post' ) {
+	} elseif ($post_id == 'new_post') {
 		
 		// new post
-		$form['new_post'] = acf_parse_args( $form['new_post'], array(
+		$form['new_post'] = acf_parse_args($form['new_post'], array(
 			'post_type' 	=> 'post',
 			'post_status'	=> 'draft',
 		));
@@ -1137,7 +1137,7 @@ 
 	
 	
 	// save post_title
-	if( isset($_POST['acf']['_post_title']) ) {
+	if (isset($_POST['acf']['_post_title'])) {
 		
 		$save['post_title'] = acf_extract_var($_POST['acf'], '_post_title');
 	
@@ -1145,7 +1145,7 @@ 
 	
 	
 	// save post_content
-	if( isset($_POST['acf']['_post_content']) ) {
+	if (isset($_POST['acf']['_post_content'])) {
 		
 		$save['post_content'] = acf_extract_var($_POST['acf'], '_post_content');
 		
@@ -1153,20 +1153,20 @@ 
 	
 	
 	// validate
-	if( count($save) == 1 ) {
+	if (count($save) == 1) {
 		
 		return $post_id;
 		
 	}
 	
 	
-	if( $save['ID'] ) {
+	if ($save['ID']) {
 		
-		wp_update_post( $save );
+		wp_update_post($save);
 		
 	} else {
 		
-		$post_id = wp_insert_post( $save );
+		$post_id = wp_insert_post($save);
 		
 	}
 		
@@ -1201,14 +1201,14 @@ 
 *  @return	N/A
 */
 
-function acf_form( $args = array() ) {
+function acf_form($args = array()) {
 	
 	// vars
 	$url = acf_get_current_url();
 	
 	
 	// defaults
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'id'					=> 'acf-form',
 		'post_id'				=> false,
 		'new_post'				=> false,
@@ -1218,7 +1218,7 @@ 
 		'post_content'			=> false,
 		'form'					=> true,
 		'form_attributes'		=> array(),
-		'return'				=> add_query_arg( 'updated', 'true', $url ),
+		'return'				=> add_query_arg('updated', 'true', $url),
 		'html_before_fields'	=> '',
 		'html_after_fields'		=> '',
 		'submit_value'			=> __("Update", 'acf'),
@@ -1229,7 +1229,7 @@ 
 		'uploader'				=> 'wp'
 	));
 	
-	$args['form_attributes'] = wp_parse_args( $args['form_attributes'], array(
+	$args['form_attributes'] = wp_parse_args($args['form_attributes'], array(
 		'id'					=> 'post',
 		'class'					=> '',
 		'action'				=> '',
@@ -1238,7 +1238,7 @@ 
 	
 	
 	// filter post_id
-	$args['post_id'] = acf_get_valid_post_id( $args['post_id'] );
+	$args['post_id'] = acf_get_valid_post_id($args['post_id']);
 	
 	
 	// load values from this post
@@ -1246,14 +1246,14 @@ 
 	
 	
 	// new post?
-	if( $post_id == 'new_post' ) {
+	if ($post_id == 'new_post') {
 		
 		// dont load values
 		$post_id = false;
 		
 		
 		// new post defaults
-		$args['new_post'] = acf_parse_args( $args['new_post'], array(
+		$args['new_post'] = acf_parse_args($args['new_post'], array(
 			'post_type' 	=> 'post',
 			'post_status'	=> 'draft',
 		));
@@ -1271,7 +1271,7 @@ 
 	
 	
 	// post_title
-	if( $args['post_title'] ) {
+	if ($args['post_title']) {
 		
 		$fields[] = acf_get_valid_field(array(
 			'name'		=> '_post_title',
@@ -1285,7 +1285,7 @@ 
 	
 	
 	// post_content
-	if( $args['post_content'] ) {
+	if ($args['post_content']) {
 		
 		$fields[] = acf_get_valid_field(array(
 			'name'		=> '_post_content',
@@ -1298,24 +1298,24 @@ 
 	
 	
 	// specific fields
-	if( $args['fields'] ) {
+	if ($args['fields']) {
 		
-		foreach( $args['fields'] as $selector ) {
+		foreach ($args['fields'] as $selector) {
 			
 			// append field ($strict = false to allow for better compatibility with field names)
-			$fields[] = acf_maybe_get_field( $selector, $post_id, false );
+			$fields[] = acf_maybe_get_field($selector, $post_id, false);
 			
 		}
 		
-	} elseif( $args['field_groups'] ) {
+	} elseif ($args['field_groups']) {
 		
-		foreach( $args['field_groups'] as $selector ) {
+		foreach ($args['field_groups'] as $selector) {
 		
-			$field_groups[] = acf_get_field_group( $selector );
+			$field_groups[] = acf_get_field_group($selector);
 			
 		}
 		
-	} elseif( $args['post_id'] == 'new_post' ) {
+	} elseif ($args['post_id'] == 'new_post') {
 		
 		$field_groups = acf_get_field_groups(array(
 			'post_type' => $args['new_post']['post_type']
@@ -1331,15 +1331,15 @@ 
 	
 	
 	//load fields based on field groups
-	if( !empty($field_groups) ) {
+	if ( ! empty($field_groups)) {
 		
-		foreach( $field_groups as $field_group ) {
+		foreach ($field_groups as $field_group) {
 			
-			$field_group_fields = acf_get_fields( $field_group );
+			$field_group_fields = acf_get_fields($field_group);
 			
-			if( !empty($field_group_fields) ) {
+			if ( ! empty($field_group_fields)) {
 				
-				foreach( array_keys($field_group_fields) as $i ) {
+				foreach (array_keys($field_group_fields) as $i) {
 					
 					$fields[] = acf_extract_var($field_group_fields, $i);
 				}
@@ -1352,9 +1352,9 @@ 
 	
 	
 	// updated message
-	if( !empty($_GET['updated']) && $args['updated_message'] ) {
+	if ( ! empty($_GET['updated']) && $args['updated_message']) {
 	
-		echo '<div id="message" class="updated"><p>' . $args['updated_message'] . '</p></div>';
+		echo '<div id="message" class="updated"><p>'.$args['updated_message'].'</p></div>';
 		
 	}
 	
@@ -1364,9 +1364,9 @@ 
 	
 	
 	// display form
-	if( $args['form'] ): ?>
+	if ($args['form']): ?>
 	
-	<form <?php acf_esc_attr_e( $args['form_attributes']); ?>>
+	<form <?php acf_esc_attr_e($args['form_attributes']); ?>>
 	
 	<?php endif; 
 		
@@ -1379,7 +1379,7 @@ 
 	
 	?>
 	<div class="acf-hidden">
-		<?php acf_hidden_input(array( 'name' => '_acf_form', 'value' => base64_encode(json_encode($args)) )); ?>
+		<?php acf_hidden_input(array('name' => '_acf_form', 'value' => base64_encode(json_encode($args)))); ?>
 	</div>
 	<div class="acf-fields acf-form-fields -<?php echo $args['label_placement']; ?>">
 	
@@ -1390,7 +1390,7 @@ 
 		
 		
 		// render
-		acf_render_fields( $post_id, $fields, $args['field_el'], $args['instruction_placement'] );
+		acf_render_fields($post_id, $fields, $args['field_el'], $args['instruction_placement']);
 		
 		
 		// html after fields
@@ -1399,7 +1399,7 @@ 
 		?>
 	
 	</div><!-- acf-form-fields -->
-	<?php if( $args['form'] ): ?>
+	<?php if ($args['form']): ?>
 	
 	<!-- Submit -->
 	<div class="acf-form-submit">
@@ -1430,18 +1430,18 @@ 
 *  @return	(boolean)
 */
 
-function update_field( $selector, $value, $post_id = false ) {
+function update_field($selector, $value, $post_id = false) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// create dummy field
-	if( !$field )
+	if ( ! $field)
 	{
 		$field = acf_get_valid_field(array(
 			'name'	=> $selector,
@@ -1452,7 +1452,7 @@ 
 	
 	
 	// save
-	return acf_update_value( $value, $post_id, $field );
+	return acf_update_value($value, $post_id, $field);
 		
 }
 
@@ -1472,10 +1472,10 @@ 
 *  @return	(boolean)
 */
 
-function update_sub_field( $selector, $value, $post_id = false ) {
+function update_sub_field($selector, $value, $post_id = false) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// vars
@@ -1483,7 +1483,7 @@ 
 	
 	
 	// within a have_rows loop
-	if( is_string($selector) ) {
+	if (is_string($selector)) {
 		
 		// get current row
 		$row = acf_get_row();
@@ -1494,11 +1494,11 @@ 
 		
 		
 		// get sub field
-		$field = get_sub_field_object( $selector, false, false );
+		$field = get_sub_field_object($selector, false, false);
 		
 		
 		// create dummy field
-		if( !$field ) {
+		if ( ! $field) {
 		
 			$field = acf_get_valid_field(array(
 				'name'	=> $selector,
@@ -1513,10 +1513,10 @@ 
 		$field['name'] = "{$row['name']}_{$row['i']}_{$field['name']}";
 		
 		
-	} elseif( is_array($selector) ) {
+	} elseif (is_array($selector)) {
 		
 		// validate
-		if( count($selector) < 3 ) {
+		if (count($selector) < 3) {
 			
 			return false;
 			
@@ -1524,11 +1524,11 @@ 
 		
 		
 		// vars
-		$parent_name = acf_extract_var( $selector, 0 );
+		$parent_name = acf_extract_var($selector, 0);
 		
 		
 		// load parent
-		$field = acf_maybe_get_field( $parent_name, $post_id );
+		$field = acf_maybe_get_field($parent_name, $post_id);
 		
 		
 		// add to name
@@ -1536,9 +1536,9 @@ 
 		
 		
 		// sub fields
-		foreach( $selector as $s ) {
+		foreach ($selector as $s) {
 				
-			if( is_numeric($s) ) {
+			if (is_numeric($s)) {
 				
 				// get row index
 				$row_i = intval($s) - 1;
@@ -1549,11 +1549,11 @@ 
 			} else {
 				
 				// update parent
-				$field = acf_get_sub_field( $s, $field );
+				$field = acf_get_sub_field($s, $field);
 				
 				
 				// create dummy field
-				if( !$field ) {
+				if ( ! $field) {
 				
 					$field = acf_get_valid_field(array(
 						'name'	=> $s,
@@ -1582,15 +1582,15 @@ 
 	
 	
 	// delete
-	if( $value === null ) {
+	if ($value === null) {
 		
-		return acf_delete_value( $post_id, $field );
+		return acf_delete_value($post_id, $field);
 		
 	}
 	
 	
 	// update
-	return acf_update_value( $value, $post_id, $field );
+	return acf_update_value($value, $post_id, $field);
 		
 }
 
@@ -1609,18 +1609,18 @@ 
 *  @return	(boolean)
 */
 
-function delete_field( $selector, $post_id = false ) {
+function delete_field($selector, $post_id = false) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// delete
-	return acf_delete_value( $post_id, $field );
+	return acf_delete_value($post_id, $field);
 	
 }
 
@@ -1640,9 +1640,9 @@ 
 *  @return	(boolean)
 */
 
-function delete_sub_field( $selector, $post_id = false ) {
+function delete_sub_field($selector, $post_id = false) {
 	
-	return update_sub_field( $selector, null, $post_id );
+	return update_sub_field($selector, null, $post_id);
 		
 }
 
@@ -1660,18 +1660,18 @@ 
 *  @return	$post_id (int)
 */
 
-function add_row( $selector, $value, $post_id = false ) {
+function add_row($selector, $value, $post_id = false) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// bail early if no field
-	if( !$field ) {
+	if ( ! $field) {
 		
 		return false;
 		
@@ -1679,14 +1679,14 @@ 
 	
 	
 	// get row count
-	$i = (int) acf_get_metadata( $post_id, $field['name'] );
+	$i = (int) acf_get_metadata($post_id, $field['name']);
 	
 	
 	// if no rows, save this field via update_field() so that the reference field is created
-	if( !$i ) {
+	if ( ! $i) {
 		
 		// acf_update_value will return boolean, simply convert this to int for 1 | 0 (the number of rows!)
-		return (int) acf_update_value( array( $value ), $post_id, $field );
+		return (int) acf_update_value(array($value), $post_id, $field);
 		
 	}
 	
@@ -1696,15 +1696,15 @@ 
 	
 	
 	// update meta
-	$result = acf_update_metadata( $post_id, $field['name'], $i );
+	$result = acf_update_metadata($post_id, $field['name'], $i);
 	
 	
 	// update sub fields
-	if( $value ) {
+	if ($value) {
 		
-		foreach( $value as $k => $v ) {
+		foreach ($value as $k => $v) {
 		
-			update_sub_field( array( $field['key'], $i, $k ), $v, $post_id );
+			update_sub_field(array($field['key'], $i, $k), $v, $post_id);
 			
 		}
 	
@@ -1730,10 +1730,10 @@ 
 *  @return	$post_id (int)
 */
 
-function update_row( $selector, $row = 1, $value = false, $post_id = false ) {
+function update_row($selector, $row = 1, $value = false, $post_id = false) {
 	
 	// bail early if no value
-	if( empty($value) ) {
+	if (empty($value)) {
 		
 		return false;
 		
@@ -1741,21 +1741,21 @@ 
 	
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// bail early if no field
-	if( !$field ) return false;
+	if ( ! $field) return false;
 	
 	
 	// update sub fields
-	foreach( $value as $k => $v ) {
+	foreach ($value as $k => $v) {
 		
-		update_sub_field( array( $field['key'], $row, $k ), $v, $post_id );
+		update_sub_field(array($field['key'], $row, $k), $v, $post_id);
 		
 	}
 	
@@ -1779,18 +1779,18 @@ 
 *  @return	$post_id (int)
 */
 
-function delete_row( $selector, $row = 1, $post_id = false ) {
+function delete_row($selector, $row = 1, $post_id = false) {
 	
 	// filter post_id
-	$post_id = acf_get_valid_post_id( $post_id );
+	$post_id = acf_get_valid_post_id($post_id);
 	
 	
 	// get field
-	$field = acf_maybe_get_field( $selector, $post_id );
+	$field = acf_maybe_get_field($selector, $post_id);
 	
 	
 	// bail early if no field
-	if( !$field ) {
+	if ( ! $field) {
 		
 		return false;
 		
@@ -1798,11 +1798,11 @@ 
 	
 	
 	// get value
-	$rows = acf_get_value( $post_id, $field );
+	$rows = acf_get_value($post_id, $field);
 	
 	
 	// bail early if no value
-	if( empty($rows) ) {
+	if (empty($rows)) {
 		
 		return false;
 		
@@ -1810,17 +1810,17 @@ 
 	
 	
 	// deincrement
-	if( $row = count($rows) ) {
+	if ($row = count($rows)) {
 		
-		acf_update_metadata( $post_id, $field['name'], $row-1 );
+		acf_update_metadata($post_id, $field['name'], $row - 1);
 		
 	}
 	
 	
 	// update sub field values
-	foreach( $rows[0] as $k => $v ) {
+	foreach ($rows[0] as $k => $v) {
 		
-		update_sub_field( array( $field['key'], $row, $k ), null, $post_id );
+		update_sub_field(array($field['key'], $row, $k), null, $post_id);
 		
 	}
 	
@@ -1845,14 +1845,14 @@ 
 *  @return	N/A
 */
 
-function create_field( $field ) {
+function create_field($field) {
 
-	acf_render_field( $field );
+	acf_render_field($field);
 }
 
-function render_field( $field ) {
+function render_field($field) {
 
-	acf_render_field( $field );
+	acf_render_field($field);
 }
 
 
@@ -1871,10 +1871,10 @@ 
 *  @return	N/A
 */
 
-function acf_convert_field_names_to_keys( $value, $field ) {
+function acf_convert_field_names_to_keys($value, $field) {
 	
 	// only if $field has sub fields
-	if( !isset($field['sub_fields']) ) {
+	if ( ! isset($field['sub_fields'])) {
 		
 		return $value;
 		
@@ -1883,11 +1883,11 @@ 
 
 	// define sub field keys
 	$sub_fields = array();
-	if( $field['sub_fields'] ) {
+	if ($field['sub_fields']) {
 		
-		foreach( $field['sub_fields'] as $sub_field ) {
+		foreach ($field['sub_fields'] as $sub_field) {
 			
-			$sub_fields[ $sub_field['name'] ] = $sub_field;
+			$sub_fields[$sub_field['name']] = $sub_field;
 			
 		}
 		
@@ -1895,16 +1895,16 @@ 
 	
 	
 	// loop through the values and format the array to use sub field keys
-	if( is_array($value) ) {
+	if (is_array($value)) {
 		
-		foreach( $value as $row_i => $row) {
+		foreach ($value as $row_i => $row) {
 			
-			if( $row ) {
+			if ($row) {
 				
-				foreach( $row as $sub_field_name => $sub_field_value ) {
+				foreach ($row as $sub_field_name => $sub_field_value) {
 					
 					// sub field must exist!
-					if( !isset($sub_fields[ $sub_field_name ]) ) {
+					if ( ! isset($sub_fields[$sub_field_name])) {
 						
 						continue;
 						
@@ -1912,16 +1912,16 @@ 
 					
 					
 					// vars
-					$sub_field = $sub_fields[ $sub_field_name ];
-					$sub_field_value = acf_convert_field_names_to_keys( $sub_field_value, $sub_field );
+					$sub_field = $sub_fields[$sub_field_name];
+					$sub_field_value = acf_convert_field_names_to_keys($sub_field_value, $sub_field);
 					
 					
 					// set new value
-					$value[$row_i][ $sub_field['key'] ] = $sub_field_value;
+					$value[$row_i][$sub_field['key']] = $sub_field_value;
 					
 					
 					// unset old value
-					unset( $value[$row_i][$sub_field_name] );
+					unset($value[$row_i][$sub_field_name]);
 						
 					
 				}
@@ -1956,10 +1956,10 @@ 
 *  @return	$post_id (int)
 */
 
-function register_field_group( $field_group ) {
+function register_field_group($field_group) {
 	
 	// add local
-	acf_add_local_field_group( $field_group );
+	acf_add_local_field_group($field_group);
 	
 }
 
@@ -1983,21 +1983,21 @@ 
 	
 }
 
-function the_repeater_field( $field_name, $post_id = false ) {
+function the_repeater_field($field_name, $post_id = false) {
 	
-	return has_sub_field( $field_name, $post_id );
+	return has_sub_field($field_name, $post_id);
 	
 }
 
-function the_flexible_field( $field_name, $post_id = false ) {
+function the_flexible_field($field_name, $post_id = false) {
 	
-	return has_sub_field( $field_name, $post_id );
+	return has_sub_field($field_name, $post_id);
 	
 }
 
-function acf_filter_post_id( $post_id ) {
+function acf_filter_post_id($post_id) {
 	
-	return acf_get_valid_post_id( $post_id );
+	return acf_get_valid_post_id($post_id);
 	
 }
 

Braces +7 added lines, -4 removed lines

@@ -654,7 +654,9 @@ 
 	
 	
 	// bail early if no row
-	if( !$row ) return 0;
+	if( !$row ) {
+		return 0;
+	}
 	
 	
 	// return
@@ -683,8 +685,7 @@ 
 	if( $hard_reset )
 	{
 		$GLOBALS['acf_field'] = array();
-	}
-	else
+	} else
 	{
 		// vars
 		$depth = count( $GLOBALS['acf_field'] ) - 1;
@@ -1749,7 +1750,9 @@ 
 	
 	
 	// bail early if no field
-	if( !$field ) return false;
+	if( !$field ) {
+		return false;
+	}
 	
 	
 	// update sub fields

includes/acf/forms/user.php

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 	*  @return	n/a
 	*/
 	
+	/**
+	 * @param string $user_form
+	 */
 	function render( $user_id, $user_form, $el = 'tr' ) {
 		
 		// vars

Indentation +2 added lines, -2 removed lines

@@ -382,8 +382,8 @@
 		}
 		
 	    
-	    // save data
-	    if( acf_validate_save_post(true) ) {
+		// save data
+		if( acf_validate_save_post(true) ) {
 	    	
 			acf_save_post( "user_{$user_id}" );
 		

Spacing +31 added lines, -31 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_user') ) :
+if ( ! class_exists('acf_form_user')) :
 
 class acf_form_user {
 	
@@ -33,20 +33,20 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',			array($this, 'admin_enqueue_scripts'));
-		add_action('login_form_register', 			array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
+		add_action('login_form_register', array($this, 'admin_enqueue_scripts'));
 		
 		// render
-		add_action('show_user_profile', 			array($this, 'edit_user'));
-		add_action('edit_user_profile',				array($this, 'edit_user'));
-		add_action('user_new_form',					array($this, 'user_new_form'));
-		add_action('register_form',					array($this, 'register_user'));
+		add_action('show_user_profile', array($this, 'edit_user'));
+		add_action('edit_user_profile', array($this, 'edit_user'));
+		add_action('user_new_form', array($this, 'user_new_form'));
+		add_action('register_form', array($this, 'register_user'));
 		
 		// save
 		//add_action('edit_user_profile_update',	array($this, 'save_user'));
 		//add_action('personal_options_update',		array($this, 'save_user'));
-		add_action('user_register',					array($this, 'save_user'));
-		add_action('profile_update',				array($this, 'save_user'));
+		add_action('user_register', array($this, 'save_user'));
+		add_action('profile_update', array($this, 'save_user'));
 		
 	}
 	
@@ -71,7 +71,7 @@ 
 		
 		
 		// validate page
-		if( in_array( $pagenow, array('profile.php', 'user-edit.php', 'user-new.php', 'wp-login.php') ) ) {
+		if (in_array($pagenow, array('profile.php', 'user-edit.php', 'user-new.php', 'wp-login.php'))) {
 			
 			return true;
 		
@@ -100,7 +100,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( ! $this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 		
 			return;
 			
@@ -137,7 +137,7 @@ 
 		
 		
 		// render
-		$this->render( 0, 'register', 'div' );
+		$this->render(0, 'register', 'div');
 		
 	}
 	
@@ -155,14 +155,14 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_user( $user ) {
+	function edit_user($user) {
 		
 		// update vars
 		$this->form = '#your-profile';
 		
 		
 		// render
-		$this->render( $user->ID, 'edit', 'tr' );
+		$this->render($user->ID, 'edit', 'tr');
 		
 	}
 	
@@ -187,7 +187,7 @@ 
 		
 		
 		// render
-		$this->render( 0, 'add', 'tr' );
+		$this->render(0, 'add', 'tr');
 		
 	}
 	
@@ -207,7 +207,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function render( $user_id, $user_form, $el = 'tr' ) {
+	function render($user_id, $user_form, $el = 'tr') {
 		
 		// vars
 		$post_id = "user_{$user_id}";
@@ -215,7 +215,7 @@ 
 		
 		
 		// show title
-		if( $user_form == 'register' ) {
+		if ($user_form == 'register') {
 			
 			$show_title = false;
 		
@@ -228,7 +228,7 @@ 
 			'user_form'	=> $user_form
 		);
 		
-		if( $user_id ) {
+		if ($user_id) {
 		
 			$args['user_id'] = $user_id;
 			
@@ -236,34 +236,34 @@ 
 		
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			acf_form_data(array( 
 				'post_id'	=> $post_id, 
 				'nonce'		=> 'user' 
 			));
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 
 				?>
-				<?php if( $show_title && $field_group['style'] == 'default' ): ?>
+				<?php if ($show_title && $field_group['style'] == 'default'): ?>
 					<h3><?php echo $field_group['title']; ?></h3>
 				<?php endif; ?>
 				
-				<?php if( $el == 'tr' ): ?>
+				<?php if ($el == 'tr'): ?>
 					<table class="form-table">
 						<tbody>
 				<?php endif; ?>
 				
-					<?php acf_render_fields( $post_id, $fields, $el, 'field' ); ?>
+					<?php acf_render_fields($post_id, $fields, $el, 'field'); ?>
 				
-				<?php if( $el == 'tr' ): ?>
+				<?php if ($el == 'tr'): ?>
 						</tbody>
 					</table>
 				<?php endif; ?>
@@ -294,7 +294,7 @@ 
 ?>
 <style type="text/css">
 
-<?php if( is_admin() ): ?>
+<?php if (is_admin()): ?>
 
 /* override for user css */
 .acf-field input[type="text"],
@@ -372,10 +372,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_user( $user_id ) {
+	function save_user($user_id) {
 		
 		// verify and remove nonce
-		if( ! acf_verify_nonce('user') ) {
+		if ( ! acf_verify_nonce('user')) {
 			
 			return $user_id;
 		
@@ -383,9 +383,9 @@ 
 		
 	    
 	    // save data
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    	
-			acf_save_post( "user_{$user_id}" );
+			acf_save_post("user_{$user_id}");
 		
 		}
 			

Braces +5 added lines, -2 removed lines

@@ -324,13 +324,16 @@
     width: 100%;
 }
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 #registerform p.submit {
 	text-align: right;
 }
 
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 </style>
 <script type="text/javascript">

includes/acf/pro/api/api-pro.php

Doc Comments +3 added lines

@@ -72,6 +72,9 @@
 *  @return	$post_id (int)
 */
 
+/**
+ * @return string
+ */
 function acf_pro_get_remote_response( $action = '', $post = array() ) {
 	
 	// vars

Indentation +15 added lines, -15 removed lines

@@ -85,15 +85,15 @@ 
 	
 	
 	// return body
-    if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
+	if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
     	
-        return $request['body'];
+		return $request['body'];
     
-    }
+	}
     
     
-    // return
-    return 0;
+	// return
+	return 0;
     
 }
 
@@ -126,12 +126,12 @@ 
 	}
 	
     
-    // return false if the external version is '<=' the current version
+	// return false if the external version is '<=' the current version
 	if( version_compare($info['version'], $version, '<=') ) {
 		
-    	return false;
+		return false;
     
-    }
+	}
     
 	
 	// return
@@ -187,20 +187,20 @@ 
 	$timeout = 12 * HOUR_IN_SECONDS;
 	
 	
-    // decode
-    if( !empty($info) ) {
+	// decode
+	if( !empty($info) ) {
     	
 		$info = json_decode($info, true);
 		
 		// fake info version
-        //$info['version'] = '6.0.0';
+		//$info['version'] = '6.0.0';
         
-    } else {
+	} else {
 	    
-	    $info = 0; // allow transient to be returned, but empty to validate
-	    $timeout = 2 * HOUR_IN_SECONDS;
+		$info = 0; // allow transient to be returned, but empty to validate
+		$timeout = 2 * HOUR_IN_SECONDS;
 	    
-    }
+	}
         
         
 	// update transient

Spacing +24 added lines, -24 removed lines

@@ -14,15 +14,15 @@ 
 *  @return	n/a
 */
 
-function acf_pro_get_view( $view_name = '', $args = array() ) {
+function acf_pro_get_view($view_name = '', $args = array()) {
 	
 	// vars
 	$path = acf_get_path("pro/admin/views/{$view_name}.php");
 	
 	
-	if( file_exists($path) ) {
+	if (file_exists($path)) {
 		
-		include( $path );
+		include($path);
 		
 	}
 	
@@ -42,7 +42,7 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_pro_get_remote_url( $action = '', $args = array() ) {
+function acf_pro_get_remote_url($action = '', $args = array()) {
 	
 	// defaults
 	$args['a'] = $action;
@@ -50,7 +50,7 @@ 
 	
 	
 	// vars
-	$url = "http://connect.advancedcustomfields.com/index.php?" . build_query($args);
+	$url = "http://connect.advancedcustomfields.com/index.php?".build_query($args);
 	
 	
 	// return
@@ -72,20 +72,20 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_pro_get_remote_response( $action = '', $post = array() ) {
+function acf_pro_get_remote_response($action = '', $post = array()) {
 	
 	// vars
-	$url = acf_pro_get_remote_url( $action );
+	$url = acf_pro_get_remote_url($action);
 	
 	
 	// connect
-	$request = wp_remote_post( $url, array(
+	$request = wp_remote_post($url, array(
 		'body' => $post
 	));
 	
 	
 	// return body
-    if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
+    if ( ! is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
     	
         return $request['body'];
     
@@ -119,7 +119,7 @@ 
 	 
 	
 	// return false if no info
-	if( empty($info['version']) ) {
+	if (empty($info['version'])) {
 		
 		return false;
 		
@@ -127,7 +127,7 @@ 
 	
     
     // return false if the external version is '<=' the current version
-	if( version_compare($info['version'], $version, '<=') ) {
+	if (version_compare($info['version'], $version, '<=')) {
 		
     	return false;
     
@@ -156,12 +156,12 @@ 
 function acf_pro_get_remote_info() {
 	
 	// clear transient if force check is enabled
-	if( !empty($_GET['force-check']) ) {
+	if ( ! empty($_GET['force-check'])) {
 		
 		// only allow transient to be deleted once per page load
-		if( empty($_GET['acf-ignore-force-check']) ) {
+		if (empty($_GET['acf-ignore-force-check'])) {
 			
-			delete_transient( 'acf_pro_get_remote_info' );
+			delete_transient('acf_pro_get_remote_info');
 			
 		}
 		
@@ -173,9 +173,9 @@ 
 	
 	
 	// get transient
-	$transient = get_transient( 'acf_pro_get_remote_info' );
+	$transient = get_transient('acf_pro_get_remote_info');
 
-	if( $transient !== false ) {
+	if ($transient !== false) {
 	
 		return $transient;
 	
@@ -188,7 +188,7 @@ 
 	
 	
     // decode
-    if( !empty($info) ) {
+    if ( ! empty($info)) {
     	
 		$info = json_decode($info, true);
 		
@@ -204,7 +204,7 @@ 
         
         
 	// update transient
-	set_transient('acf_pro_get_remote_info', $info, $timeout );
+	set_transient('acf_pro_get_remote_info', $info, $timeout);
 	
 	
 	// return
@@ -215,10 +215,10 @@ 
 function acf_pro_is_license_active() {
 	
 	// vars
-	$data = acf_pro_get_license( true );
+	$data = acf_pro_get_license(true);
 	$url = home_url();
 	
-	if( !empty($data['url']) && !empty($data['key']) && $data['url'] == $url ) {
+	if ( ! empty($data['url']) && ! empty($data['key']) && $data['url'] == $url) {
 		
 		return true;
 		
@@ -229,7 +229,7 @@ 
 	
 }
 
-function acf_pro_get_license( $all = false ) {
+function acf_pro_get_license($all = false) {
 	
 	// get option
 	$data = get_option('acf_pro_license');
@@ -240,12 +240,12 @@ 
 	
 	
 	// attempt deserialize
-	if( is_serialized( $data ) )
+	if (is_serialized($data))
 	{
 		$data = maybe_unserialize($data);
 		
 		// $all
-		if( !$all )
+		if ( ! $all)
 		{
 			$data = $data['key'];
 		}
@@ -260,7 +260,7 @@ 
 
 
 
-function acf_pro_update_license( $license ) {
+function acf_pro_update_license($license) {
 	
 	$save = array(
 		'key'	=> $license,

functions.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * as indicating support for post thumbnails.
  */
 function lighthouse_setup() {
-    // This theme styles the visual editor to resemble the theme style.
+	// This theme styles the visual editor to resemble the theme style.
 	$font_url = 'https://fonts.googleapis.com/css?family=Questrial';
 	add_editor_style( 
 		array( 

Spacing +45 added lines, -45 removed lines

@@ -7,7 +7,7 @@ 
  * @package Lighthouse
  */
 
-if ( ! function_exists( 'lighthouse_setup' ) ) :
+if ( ! function_exists('lighthouse_setup')) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -25,7 +25,7 @@ 
 
 	add_editor_style( 
 		array( 
-			'style.css', str_replace( ',', '%2C', $font_url_Questrial), str_replace( ',', '%2C', $font_url_Raleway), str_replace( ',', '%2C', $font_url_Montserrat)
+			'style.css', str_replace(',', '%2C', $font_url_Questrial), str_replace(',', '%2C', $font_url_Raleway), str_replace(',', '%2C', $font_url_Montserrat)
 			) 
 		);
 	/*
@@ -34,10 +34,10 @@ 
 	 * If you're building a theme based on Lighthouse, use a find and replace
 	 * to change 'lighthouse' to the name of your theme in all the template files.
 	 */
-	load_theme_textdomain( 'lighthouse', get_template_directory() . '/languages' );
+	load_theme_textdomain('lighthouse', get_template_directory().'/languages');
 
 	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	/*
 	 * Let WordPress manage the document title.
@@ -45,20 +45,20 @@ 
 	 * hard-coded <title> tag in the document head, and expect WordPress to
 	 * provide it for us.
 	 */
-	add_theme_support( 'title-tag' );
+	add_theme_support('title-tag');
 
 	/*
 	 * Enable support for Post Thumbnails on posts and pages.
 	 *
 	 * @link https://developer.wordpress.org/themes/functionality/featured-images-post-thumbnails/
 	 */
-	add_theme_support( 'post-thumbnails' );
+	add_theme_support('post-thumbnails');
 
-	add_image_size( 'lighthouse_feature_img', 1000, 310, array( 'center', 'center' ) );
+	add_image_size('lighthouse_feature_img', 1000, 310, array('center', 'center'));
 
-	add_image_size( 'lighthouse_blog_listing', 714, 274, array( 'center', 'center' ) );
+	add_image_size('lighthouse_blog_listing', 714, 274, array('center', 'center'));
 
-	add_image_size( 'lighthouse_related_post', 475, 280, array( 'center', 'center' ) );
+	add_image_size('lighthouse_related_post', 475, 280, array('center', 'center'));
 
 
 	/*
@@ -72,45 +72,45 @@ 
 	 *
 	 * @link https://codex.wordpress.org/Function_Reference/get_search_form
 	 */
-	add_theme_support( 'html5', array( 'search-form' ) ); 
+	add_theme_support('html5', array('search-form')); 
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menus( array(
-		'primary' => esc_html__( 'Primary', 'lighthouse' ),
-		) );
+	register_nav_menus(array(
+		'primary' => esc_html__('Primary', 'lighthouse'),
+		));
 
 	/*
 	 * Switch default core markup for search form, comment form, and comments
 	 * to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
+	add_theme_support('html5', array(
 		'search-form',
 		'comment-form',
 		'comment-list',
 		'gallery',
 		'caption',
-		) );
+		));
 
 	/*
 	 * Enable support for Post Formats.
 	 * See https://developer.wordpress.org/themes/functionality/post-formats/
 	 */
-	add_theme_support( 'post-formats', array(
+	add_theme_support('post-formats', array(
 		'aside',
 		'image',
 		'video',
 		'quote',
 		'link',
-		) );
+		));
 
 	// Set up the WordPress core custom background feature.
-	add_theme_support( 'custom-background', apply_filters( 'lighthouse_custom_background_args', array(
+	add_theme_support('custom-background', apply_filters('lighthouse_custom_background_args', array(
 		'default-color' => 'ffffff',
 		'default-image' => '',
-		) ) );
+		)));
 }
 endif;
-add_action( 'after_setup_theme', 'lighthouse_setup' );
+add_action('after_setup_theme', 'lighthouse_setup');
 
 /**
  * Set the content width in pixels, based on the theme's design and stylesheet.
@@ -120,16 +120,16 @@ 
  * @global int $content_width
  */
 function lighthouse_content_width() {
-	$GLOBALS['content_width'] = apply_filters( 'lighthouse_content_width', 640 );
+	$GLOBALS['content_width'] = apply_filters('lighthouse_content_width', 640);
 }
-add_action( 'after_setup_theme', 'lighthouse_content_width', 0 );
+add_action('after_setup_theme', 'lighthouse_content_width', 0);
 
 /**
  * Enqueue scripts and styles.
  */
 function lighthouse_scripts() {
 
-	wp_enqueue_style( 'lighthouse-style', get_stylesheet_uri() );
+	wp_enqueue_style('lighthouse-style', get_stylesheet_uri());
 
 	wp_enqueue_style('lighthouse-google-fonts-questrial', 'https://fonts.googleapis.com/css?family=Questrial');
 
@@ -137,53 +137,53 @@ 
 
 	wp_enqueue_style('lighthouse-google-fonts-montserrat', 'https://fonts.googleapis.com/css?family=Montserrat:400,700');
 
-	wp_enqueue_script( 'lighthouse-classList-js', 'https://cdnjs.cloudflare.com/ajax/libs/classlist/2014.01.31/classList.min.js', array('jquery'), '');
+	wp_enqueue_script('lighthouse-classList-js', 'https://cdnjs.cloudflare.com/ajax/libs/classlist/2014.01.31/classList.min.js', array('jquery'), '');
 
-	wp_enqueue_script( 'lighthouse-bootstrap-js', get_template_directory_uri() . '/js/bootstrap.min.js', array('jquery'), '', true );
+	wp_enqueue_script('lighthouse-bootstrap-js', get_template_directory_uri().'/js/bootstrap.min.js', array('jquery'), '', true);
 
-	wp_enqueue_script( 'lighthouse-material-menu-js', get_template_directory_uri() . '/js/materialMenu.min.js', array('jquery'), '', true );
+	wp_enqueue_script('lighthouse-material-menu-js', get_template_directory_uri().'/js/materialMenu.min.js', array('jquery'), '', true);
 
-	wp_enqueue_script( 'lighthouse-owl-carousel-js', get_template_directory_uri() . '/js/owl-carousel.min.js', array('jquery'), '', true );
+	wp_enqueue_script('lighthouse-owl-carousel-js', get_template_directory_uri().'/js/owl-carousel.min.js', array('jquery'), '', true);
 
-	wp_enqueue_script( 'lighthouse-match-height-js', get_template_directory_uri() . '/js/jquery.matchHeight-min.js', array('jquery'), '', true );
+	wp_enqueue_script('lighthouse-match-height-js', get_template_directory_uri().'/js/jquery.matchHeight-min.js', array('jquery'), '', true);
 
-	wp_enqueue_script( 'lighthouse-navigation', get_template_directory_uri() . '/js/navigation.min.js', array(), '20120206', true );
+	wp_enqueue_script('lighthouse-navigation', get_template_directory_uri().'/js/navigation.min.js', array(), '20120206', true);
 
-	wp_enqueue_script( 'lighthouse-settings-js', get_template_directory_uri() . '/js/lighthouse-settings.min.js', array('jquery'), '20160220', true );
+	wp_enqueue_script('lighthouse-settings-js', get_template_directory_uri().'/js/lighthouse-settings.min.js', array('jquery'), '20160220', true);
 
-	wp_enqueue_script( 'lighthouse-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.min.js', array(), '20130115', true );
+	wp_enqueue_script('lighthouse-skip-link-focus-fix', get_template_directory_uri().'/js/skip-link-focus-fix.min.js', array(), '20130115', true);
 
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments')) {
+		wp_enqueue_script('comment-reply');
 	}
 }
-add_action( 'wp_enqueue_scripts', 'lighthouse_scripts' );
+add_action('wp_enqueue_scripts', 'lighthouse_scripts');
 
 
 /**
  * Implement the Custom Header feature.
  */
-require get_template_directory() . '/inc/custom-header.php';
+require get_template_directory().'/inc/custom-header.php';
 
 /**
  * Custom template tags for this theme.
  */
-require get_template_directory() . '/inc/template-tags.php';
+require get_template_directory().'/inc/template-tags.php';
 
 /**
  * Custom functions that act independently of the theme templates.
  */
-require get_template_directory() . '/inc/extras.php';
+require get_template_directory().'/inc/extras.php';
 
 /**
  * Customizer additions.
  */
-require get_template_directory() . '/inc/customizer.php';
+require get_template_directory().'/inc/customizer.php';
 
 /**
  * Load Jetpack compatibility file.
  */
-require get_template_directory() . '/inc/jetpack.php';
+require get_template_directory().'/inc/jetpack.php';
 
 
 /**
@@ -191,19 +191,19 @@ 
  */
 
 // ACF
-include_once( get_stylesheet_directory() . '/includes/acf/acf.php' );
+include_once(get_stylesheet_directory().'/includes/acf/acf.php');
 
 // ACF Settings
-include_once( get_stylesheet_directory() . '/includes/acf-settings.php' );
+include_once(get_stylesheet_directory().'/includes/acf-settings.php');
 
 // Widgets
-include_once( get_stylesheet_directory() . '/includes/widgets.php' );
+include_once(get_stylesheet_directory().'/includes/widgets.php');
 
 // Menus
-include_once( get_stylesheet_directory() . '/includes/menus.php' );
+include_once(get_stylesheet_directory().'/includes/menus.php');
 
 // Theme Settings
-include_once( get_stylesheet_directory() . '/includes/theme-settings.php' );
+include_once(get_stylesheet_directory().'/includes/theme-settings.php');
 
 // Shortcodes
-include_once( get_stylesheet_directory() . '/includes/shortcodes.php' );
+include_once(get_stylesheet_directory().'/includes/shortcodes.php');

inc/template-tags.php

Spacing +34 added lines, -34 removed lines

@@ -7,69 +7,69 @@ 
  * @package Lighthouse
  */
 
-if ( ! function_exists( 'lighthouse_posted_on' ) ) :
+if ( ! function_exists('lighthouse_posted_on')) :
 /**
  * Prints HTML with meta information for the current post-date/time and author.
  */
 function lighthouse_posted_on() {
 	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+	if (get_the_time('U') !== get_the_modified_time('U')) {
 		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
 	}
 
-	$time_string = sprintf( $time_string,
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_attr( get_the_modified_date( 'c' ) ),
-		esc_html( get_the_modified_date() )
+	$time_string = sprintf($time_string,
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date()),
+		esc_attr(get_the_modified_date('c')),
+		esc_html(get_the_modified_date())
 	);
 
 	$posted_on = sprintf(
-		esc_html_x( 'Posted on %s', 'post date', 'lighthouse' ),
-		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
+		esc_html_x('Posted on %s', 'post date', 'lighthouse'),
+		'<a href="'.esc_url(get_permalink()).'" rel="bookmark">'.$time_string.'</a>'
 	);
 
 	$byline = sprintf(
-		esc_html_x( 'by %s', 'post author', 'lighthouse' ),
-		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span>'
+		esc_html_x('by %s', 'post author', 'lighthouse'),
+		'<span class="author vcard"><a class="url fn n" href="'.esc_url(get_author_posts_url(get_the_author_meta('ID'))).'">'.esc_html(get_the_author()).'</a></span>'
 	);
 
-	echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
+	echo '<span class="posted-on">'.$posted_on.'</span><span class="byline"> '.$byline.'</span>'; // WPCS: XSS OK.
 
 }
 endif;
 
-if ( ! function_exists( 'lighthouse_entry_footer' ) ) :
+if ( ! function_exists('lighthouse_entry_footer')) :
 /**
  * Prints HTML with meta information for the categories, tags and comments.
  */
 function lighthouse_entry_footer() {
 	// Hide category and tag text for pages.
-	if ( 'post' === get_post_type() ) {
+	if ('post' === get_post_type()) {
 		/* translators: used between list items, there is a space after the comma */
-		$categories_list = get_the_category_list( esc_html__( ', ', 'lighthouse' ) );
-		if ( $categories_list && lighthouse_categorized_blog() ) {
-			printf( '<span class="cat-links">' . esc_html__( 'Posted in %1$s', 'lighthouse' ) . '</span>', $categories_list ); // WPCS: XSS OK.
+		$categories_list = get_the_category_list(esc_html__(', ', 'lighthouse'));
+		if ($categories_list && lighthouse_categorized_blog()) {
+			printf('<span class="cat-links">'.esc_html__('Posted in %1$s', 'lighthouse').'</span>', $categories_list); // WPCS: XSS OK.
 		}
 
 		/* translators: used between list items, there is a space after the comma */
-		$tags_list = get_the_tag_list( '', esc_html__( ', ', 'lighthouse' ) );
-		if ( $tags_list ) {
-			printf( '<span class="tags-links">' . esc_html__( 'Tagged %1$s', 'lighthouse' ) . '</span>', $tags_list ); // WPCS: XSS OK.
+		$tags_list = get_the_tag_list('', esc_html__(', ', 'lighthouse'));
+		if ($tags_list) {
+			printf('<span class="tags-links">'.esc_html__('Tagged %1$s', 'lighthouse').'</span>', $tags_list); // WPCS: XSS OK.
 		}
 	}
 
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+	if ( ! is_single() && ! post_password_required() && (comments_open() || get_comments_number())) {
 		echo '<span class="comments-link">';
-		comments_popup_link( esc_html__( 'Leave a comment', 'lighthouse' ), esc_html__( '1 Comment', 'lighthouse' ), esc_html__( '% Comments', 'lighthouse' ) );
+		comments_popup_link(esc_html__('Leave a comment', 'lighthouse'), esc_html__('1 Comment', 'lighthouse'), esc_html__('% Comments', 'lighthouse'));
 		echo '</span>';
 	}
 
 	edit_post_link(
 		sprintf(
 			/* translators: %s: Name of current post */
-			esc_html__( 'Edit %s', 'lighthouse' ),
-			the_title( '<span class="screen-reader-text">"', '"</span>', false )
+			esc_html__('Edit %s', 'lighthouse'),
+			the_title('<span class="screen-reader-text">"', '"</span>', false)
 		),
 		'<span class="edit-link">',
 		'</span>'
@@ -83,22 +83,22 @@ 
  * @return bool
  */
 function lighthouse_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'lighthouse_categories' ) ) ) {
+	if (false === ($all_the_cool_cats = get_transient('lighthouse_categories'))) {
 		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
+		$all_the_cool_cats = get_categories(array(
 			'fields'     => 'ids',
 			'hide_empty' => 1,
 			// We only need to know if there is more than one category.
 			'number'     => 2,
-		) );
+		));
 
 		// Count the number of categories that are attached to the posts.
-		$all_the_cool_cats = count( $all_the_cool_cats );
+		$all_the_cool_cats = count($all_the_cool_cats);
 
-		set_transient( 'lighthouse_categories', $all_the_cool_cats );
+		set_transient('lighthouse_categories', $all_the_cool_cats);
 	}
 
-	if ( $all_the_cool_cats > 1 ) {
+	if ($all_the_cool_cats > 1) {
 		// This blog has more than 1 category so lighthouse_categorized_blog should return true.
 		return true;
 	} else {
@@ -111,11 +111,11 @@ 
  * Flush out the transients used in lighthouse_categorized_blog.
  */
 function lighthouse_category_transient_flusher() {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 	// Like, beat it. Dig?
-	delete_transient( 'lighthouse_categories' );
+	delete_transient('lighthouse_categories');
 }
-add_action( 'edit_category', 'lighthouse_category_transient_flusher' );
-add_action( 'save_post',     'lighthouse_category_transient_flusher' );
\ No newline at end of file
+add_action('edit_category', 'lighthouse_category_transient_flusher');
+add_action('save_post', 'lighthouse_category_transient_flusher');
\ No newline at end of file

includes/acf-settings.php

Indentation +18 added lines, -18 removed lines

@@ -8,11 +8,11 @@ 
  

 function my_acf_settings_path( $path ) {

  

-    // update path

-    $path = get_stylesheet_directory() . '/includes/acf/';

+	// update path

+	$path = get_stylesheet_directory() . '/includes/acf/';

     

-    // return

-    return $path;

+	// return

+	return $path;

 }

 

 // Customize ACF dir

@@ -20,11 +20,11 @@ 
  

 function my_acf_settings_dir( $dir ) {

  

-    // update path

-    $dir = get_stylesheet_directory_uri() . '/includes/acf/';

+	// update path

+	$dir = get_stylesheet_directory_uri() . '/includes/acf/';

     

-    // return

-    return $dir;

+	// return

+	return $dir;

 }

 

 // Save ACF field as JSON

@@ -32,11 +32,11 @@ 
  

 function my_acf_json_save_point( $path ) {

     

-    // update path

-    $path = get_stylesheet_directory() . '/includes/acf-json';

+	// update path

+	$path = get_stylesheet_directory() . '/includes/acf-json';

     

-    // return

-    return $path; 

+	// return

+	return $path; 

 }

 

 // Load ACF field from JSON

@@ -44,14 +44,14 @@ 
 

 function my_acf_json_load_point( $paths ) {

     

-    // remove original path (optional)

-    unset($paths[0]);

+	// remove original path (optional)

+	unset($paths[0]);

     

-    // append path

-    $paths[] = get_stylesheet_directory() . '/includes/acf-json';

+	// append path

+	$paths[] = get_stylesheet_directory() . '/includes/acf-json';

     

-    // return

-    return $paths;

+	// return

+	return $paths;

 }

 

 

Spacing +9 added lines, -9 removed lines

@@ -6,10 +6,10 @@ 
 // Customize ACF path

 add_filter('acf/settings/path', 'my_acf_settings_path');

  

-function my_acf_settings_path( $path ) {

+function my_acf_settings_path($path) {

  

     // update path

-    $path = get_stylesheet_directory() . '/includes/acf/';

+    $path = get_stylesheet_directory().'/includes/acf/';

     

     // return

     return $path;

@@ -18,10 +18,10 @@ 
 // Customize ACF dir

 add_filter('acf/settings/dir', 'my_acf_settings_dir');

  

-function my_acf_settings_dir( $dir ) {

+function my_acf_settings_dir($dir) {

  

     // update path

-    $dir = get_stylesheet_directory_uri() . '/includes/acf/';

+    $dir = get_stylesheet_directory_uri().'/includes/acf/';

     

     // return

     return $dir;

@@ -30,10 +30,10 @@ 
 // Save ACF field as JSON

 add_filter('acf/settings/save_json', 'my_acf_json_save_point');

  

-function my_acf_json_save_point( $path ) {

+function my_acf_json_save_point($path) {

     

     // update path

-    $path = get_stylesheet_directory() . '/includes/acf-json';

+    $path = get_stylesheet_directory().'/includes/acf-json';

     

     // return

     return $path; 

@@ -42,13 +42,13 @@ 
 // Load ACF field from JSON

 add_filter('acf/settings/load_json', 'my_acf_json_load_point');

 

-function my_acf_json_load_point( $paths ) {

+function my_acf_json_load_point($paths) {

     

     // remove original path (optional)

     unset($paths[0]);

     

     // append path

-    $paths[] = get_stylesheet_directory() . '/includes/acf-json';

+    $paths[] = get_stylesheet_directory().'/includes/acf-json';

     

     // return

     return $paths;

@@ -58,7 +58,7 @@ 
 /**************

   Options Page

 ***************/

-if( function_exists('acf_add_options_page') ) {

+if (function_exists('acf_add_options_page')) {

 	

 	acf_add_options_page(array(

 		'page_title' 	=> 'Lighthouse General Settings',

includes/acf/acf.php

Indentation +26 added lines, -26 removed lines

@@ -263,16 +263,16 @@ 
 		// register post type 'acf-field-group'
 		register_post_type('acf-field-group', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Field Groups', 'acf' ),
+				'name'					=> __( 'Field Groups', 'acf' ),
 				'singular_name'			=> __( 'Field Group', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
-			    'new_item'				=> __( 'New Field Group' , 'acf' ),
-			    'view_item'				=> __( 'View Field Group', 'acf' ),
-			    'search_items'			=> __( 'Search Field Groups', 'acf' ),
-			    'not_found'				=> __( 'No Field Groups found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
+				'add_new'				=> __( 'Add New' , 'acf' ),
+				'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
+				'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
+				'new_item'				=> __( 'New Field Group' , 'acf' ),
+				'view_item'				=> __( 'View Field Group', 'acf' ),
+				'search_items'			=> __( 'Search Field Groups', 'acf' ),
+				'not_found'				=> __( 'No Field Groups found', 'acf' ),
+				'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
 			),
 			'public'			=> false,
 			'show_ui'			=> true,
@@ -295,16 +295,16 @@ 
 		// register post type 'acf-field'
 		register_post_type('acf-field', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Fields', 'acf' ),
+				'name'					=> __( 'Fields', 'acf' ),
 				'singular_name'			=> __( 'Field', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field' , 'acf' ),
-			    'new_item'				=> __( 'New Field' , 'acf' ),
-			    'view_item'				=> __( 'View Field', 'acf' ),
-			    'search_items'			=> __( 'Search Fields', 'acf' ),
-			    'not_found'				=> __( 'No Fields found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
+				'add_new'				=> __( 'Add New' , 'acf' ),
+				'add_new_item'			=> __( 'Add New Field' , 'acf' ),
+				'edit_item'				=> __( 'Edit Field' , 'acf' ),
+				'new_item'				=> __( 'New Field' , 'acf' ),
+				'view_item'				=> __( 'View Field', 'acf' ),
+				'search_items'			=> __( 'Search Fields', 'acf' ),
+				'not_found'				=> __( 'No Fields found', 'acf' ),
+				'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
 			),
 			'public'			=> false,
 			'show_ui'			=> false,
@@ -413,27 +413,27 @@ 
 		
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key );
 			
-	    }
+		}
 	    
 	    
-	    // acf_field_name
-	    if( $field_name = $wp_query->get('acf_field_name') ) {
+		// acf_field_name
+		if( $field_name = $wp_query->get('acf_field_name') ) {
 	    
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name );
 			
-	    }
+		}
 	    
 	    
-	    // acf_group_key
+		// acf_group_key
 		if( $group_key = $wp_query->get('acf_group_key') ) {
 		
 			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key );
 			
-	    }
+		}
 	    
 	    
-	    // return
-	    return $where;
+		// return
+		return $where;
 	    
 	}
 	

Spacing +52 added lines, -52 removed lines

@@ -11,9 +11,9 @@ 
 Domain Path: /lang
 */
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if( ! class_exists('acf') ) :
+if ( ! class_exists('acf')) :
 
 class acf {
 	
@@ -64,9 +64,9 @@ 
 			'version'			=> '5.3.3.1',
 						
 			// urls
-			'basename'			=> plugin_basename( __FILE__ ),
-			'path'				=> plugin_dir_path( __FILE__ ),
-			'dir'				=> plugin_dir_url( __FILE__ ),
+			'basename'			=> plugin_basename(__FILE__),
+			'path'				=> plugin_dir_path(__FILE__),
+			'dir'				=> plugin_dir_url(__FILE__),
 			
 			// options
 			'show_admin'		=> true,
@@ -122,7 +122,7 @@ 
 		
 		
 		// admin
-		if( is_admin() ) {
+		if (is_admin()) {
 			
 			acf_include('admin/admin.php');
 			acf_include('admin/field-group.php');
@@ -139,14 +139,14 @@ 
 		
 		
 		// actions
-		add_action('init',	array($this, 'init'), 5);
-		add_action('init',	array($this, 'register_post_types'), 5);
-		add_action('init',	array($this, 'register_post_status'), 5);
-		add_action('init',	array($this, 'register_assets'), 5);
+		add_action('init', array($this, 'init'), 5);
+		add_action('init', array($this, 'register_post_types'), 5);
+		add_action('init', array($this, 'register_post_status'), 5);
+		add_action('init', array($this, 'register_assets'), 5);
 		
 		
 		// filters
-		add_filter('posts_where',		array($this, 'posts_where'), 10, 2 );
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
 		//add_filter('posts_request',	array($this, 'posts_request'), 10, 1 );
 		
 	}
@@ -168,11 +168,11 @@ 
 	function init() {
 		
 		// bail early if a plugin called get_field early
-		if( !did_action('plugins_loaded') ) return;
+		if ( ! did_action('plugins_loaded')) return;
 		
 		
 		// bail early if already init
-		if( acf_get_setting('init') ) return;
+		if (acf_get_setting('init')) return;
 		
 		
 		// only run once
@@ -180,20 +180,20 @@ 
 		
 		
 		// vars
-		$major = intval( acf_get_setting('version') );
+		$major = intval(acf_get_setting('version'));
 		
 		
 		// redeclare dir
 		// - allow another plugin to modify dir (maybe force SSL)
-		acf_update_setting('dir', plugin_dir_url( __FILE__ ));
+		acf_update_setting('dir', plugin_dir_url(__FILE__));
 		
 		
 		// set text domain
-		load_textdomain( 'acf', acf_get_path( 'lang/acf-' . get_locale() . '.mo' ) );
+		load_textdomain('acf', acf_get_path('lang/acf-'.get_locale().'.mo'));
 		
 		
 		// include wpml support
-		if( defined('ICL_SITEPRESS_VERSION') ) {
+		if (defined('ICL_SITEPRESS_VERSION')) {
 		
 			acf_include('core/wpml.php');
 			
@@ -263,16 +263,16 @@ 
 		// register post type 'acf-field-group'
 		register_post_type('acf-field-group', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Field Groups', 'acf' ),
-				'singular_name'			=> __( 'Field Group', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
-			    'new_item'				=> __( 'New Field Group' , 'acf' ),
-			    'view_item'				=> __( 'View Field Group', 'acf' ),
-			    'search_items'			=> __( 'Search Field Groups', 'acf' ),
-			    'not_found'				=> __( 'No Field Groups found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
+			    'name'					=> __('Field Groups', 'acf'),
+				'singular_name'			=> __('Field Group', 'acf'),
+			    'add_new'				=> __('Add New', 'acf'),
+			    'add_new_item'			=> __('Add New Field Group', 'acf'),
+			    'edit_item'				=> __('Edit Field Group', 'acf'),
+			    'new_item'				=> __('New Field Group', 'acf'),
+			    'view_item'				=> __('View Field Group', 'acf'),
+			    'search_items'			=> __('Search Field Groups', 'acf'),
+			    'not_found'				=> __('No Field Groups found', 'acf'),
+			    'not_found_in_trash'	=> __('No Field Groups found in Trash', 'acf'), 
 			),
 			'public'			=> false,
 			'show_ui'			=> true,
@@ -295,16 +295,16 @@ 
 		// register post type 'acf-field'
 		register_post_type('acf-field', array(
 			'labels'			=> array(
-			    'name'					=> __( 'Fields', 'acf' ),
-				'singular_name'			=> __( 'Field', 'acf' ),
-			    'add_new'				=> __( 'Add New' , 'acf' ),
-			    'add_new_item'			=> __( 'Add New Field' , 'acf' ),
-			    'edit_item'				=> __( 'Edit Field' , 'acf' ),
-			    'new_item'				=> __( 'New Field' , 'acf' ),
-			    'view_item'				=> __( 'View Field', 'acf' ),
-			    'search_items'			=> __( 'Search Fields', 'acf' ),
-			    'not_found'				=> __( 'No Fields found', 'acf' ),
-			    'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
+			    'name'					=> __('Fields', 'acf'),
+				'singular_name'			=> __('Field', 'acf'),
+			    'add_new'				=> __('Add New', 'acf'),
+			    'add_new_item'			=> __('Add New Field', 'acf'),
+			    'edit_item'				=> __('Edit Field', 'acf'),
+			    'new_item'				=> __('New Field', 'acf'),
+			    'view_item'				=> __('View Field', 'acf'),
+			    'search_items'			=> __('Search Fields', 'acf'),
+			    'not_found'				=> __('No Fields found', 'acf'),
+			    'not_found_in_trash'	=> __('No Fields found in Trash', 'acf'), 
 			),
 			'public'			=> false,
 			'show_ui'			=> false,
@@ -343,12 +343,12 @@ 
 		
 		// acf-disabled
 		register_post_status('acf-disabled', array(
-			'label'                     => __( 'Disabled', 'acf' ),
+			'label'                     => __('Disabled', 'acf'),
 			'public'                    => true,
 			'exclude_from_search'       => false,
 			'show_in_admin_all_list'    => true,
 			'show_in_admin_status_list' => true,
-			'label_count'               => _n_noop( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf' ),
+			'label_count'               => _n_noop('Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf'),
 		));
 		
 	}
@@ -376,14 +376,14 @@ 
 		
 		
 		// scripts
-		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version );
-		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version );
+		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version);
+		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version);
 		
 		
 		// styles
-		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version );
-		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version );
-		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version );
+		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version);
+		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version);
+		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version);
 		
 	}
 	
@@ -402,32 +402,32 @@ 
 	*  @return	$where (string)
 	*/
 	
-	function posts_where( $where, $wp_query ) {
+	function posts_where($where, $wp_query) {
 		
 		// global
 		global $wpdb;
 		
 		
 		// acf_field_key
-		if( $field_key = $wp_query->get('acf_field_key') ) {
+		if ($field_key = $wp_query->get('acf_field_key')) {
 		
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key);
 			
 	    }
 	    
 	    
 	    // acf_field_name
-	    if( $field_name = $wp_query->get('acf_field_name') ) {
+	    if ($field_name = $wp_query->get('acf_field_name')) {
 	    
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name);
 			
 	    }
 	    
 	    
 	    // acf_group_key
-		if( $group_key = $wp_query->get('acf_group_key') ) {
+		if ($group_key = $wp_query->get('acf_group_key')) {
 		
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key );
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key);
 			
 	    }
 	    
@@ -468,7 +468,7 @@ 
 
 	global $acf;
 	
-	if( !isset($acf) ) {
+	if ( ! isset($acf)) {
 	
 		$acf = new acf();
 		

Braces +10 added lines, -3 removed lines

@@ -11,7 +11,10 @@ 
 Domain Path: /lang
 */
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 if( ! class_exists('acf') ) :
 
@@ -168,11 +171,15 @@ 
 	function init() {
 		
 		// bail early if a plugin called get_field early
-		if( !did_action('plugins_loaded') ) return;
+		if( !did_action('plugins_loaded') ) {
+			return;
+		}
 		
 		
 		// bail early if already init
-		if( acf_get_setting('init') ) return;
+		if( acf_get_setting('init') ) {
+			return;
+		}
 		
 		
 		// only run once

includes/acf/admin/admin.php

Spacing +12 added lines, -12 removed lines

@@ -18,9 +18,9 @@ 
 	function __construct() {
 	
 		// actions
-		add_action('admin_menu', 			array($this, 'admin_menu'));
-		add_action('admin_enqueue_scripts',	array($this, 'admin_enqueue_scripts'), 0);
-		add_action('admin_notices', 		array($this, 'admin_notices'));
+		add_action('admin_menu', array($this, 'admin_menu'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 0);
+		add_action('admin_notices', array($this, 'admin_notices'));
 		
 	}
 	
@@ -41,7 +41,7 @@ 
 	function admin_menu() {
 		
 		// bail early if no show_admin
-		if( !acf_get_setting('show_admin') ) {
+		if ( ! acf_get_setting('show_admin')) {
 			
 			return;
 			
@@ -54,12 +54,12 @@ 
 		
 		
 		// add parent
-		add_menu_page(__("Custom Fields",'acf'), __("Custom Fields",'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
+		add_menu_page(__("Custom Fields", 'acf'), __("Custom Fields", 'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
 		
 		
 		// add children
-		add_submenu_page($slug, __('Field Groups','acf'), __('Field Groups','acf'), $cap, $slug );
-		add_submenu_page($slug, __('Add New','acf'), __('Add New','acf'), $cap, 'post-new.php?post_type=acf-field-group' );
+		add_submenu_page($slug, __('Field Groups', 'acf'), __('Field Groups', 'acf'), $cap, $slug);
+		add_submenu_page($slug, __('Add New', 'acf'), __('Add New', 'acf'), $cap, 'post-new.php?post_type=acf-field-group');
 		
 	}
 	
@@ -79,7 +79,7 @@ 
 	
 	function admin_enqueue_scripts() {
 		
-		wp_enqueue_style( 'acf-global' );
+		wp_enqueue_style('acf-global');
 		
 	}
 	
@@ -104,19 +104,19 @@ 
 		
 		
 		// bail early if no notices
-		if( empty($admin_notices) ) {
+		if (empty($admin_notices)) {
 			
 			return;
 			
 		}
 		
 		
-		foreach( $admin_notices as $notice ) {
+		foreach ($admin_notices as $notice) {
 			
 			$open = '';
 			$close = '';
 				
-			if( $notice['wrap'] ) {
+			if ($notice['wrap']) {
 				
 				$open = "<{$notice['wrap']}>";
 				$close = "</{$notice['wrap']}>";
@@ -124,7 +124,7 @@ 
 			}
 				
 			?>
-			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open . $notice['text'] . $close; ?></div>
+			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open.$notice['text'].$close; ?></div>
 			<?php
 				
 		}