rousnay / lighthouse

includes/acf/pro/admin/views/options-page.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 			'nonce'		=> 'options',
 		));
 		
-		wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+		wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 		
 		?>
 		
@@ -45,13 +45,13 @@ 
 						<!-- Update -->
 						<div id="submitdiv" class="postbox">
 							
-							<h3 class="hndle" style="border-bottom:none;"><span><?php _e("Publish",'acf'); ?></span></h3>
+							<h3 class="hndle" style="border-bottom:none;"><span><?php _e("Publish", 'acf'); ?></span></h3>
 							
 							<div id="major-publishing-actions">
 
 								<div id="publishing-action">
 									<span class="spinner"></span>
-									<input type="submit" accesskey="p" value="<?php _e("Save Options",'acf'); ?>" class="button button-primary button-large" id="publish" name="publish">
+									<input type="submit" accesskey="p" value="<?php _e("Save Options", 'acf'); ?>" class="button button-primary button-large" id="publish" name="publish">
 								</div>
 								
 								<div class="clear"></div>

includes/acf/pro/admin/views/settings-updates.php

Spacing +7 added lines, -7 removed lines

@@ -18,13 +18,13 @@ 
 	
 	<div class="acf-box">
 		<div class="title">
-			<h3><?php echo acf_get_setting('name'); ?> <?php _e('License','acf') ?></h3>
+			<h3><?php echo acf_get_setting('name'); ?> <?php _e('License', 'acf') ?></h3>
 		</div>
 		<div class="inner">
-			<p><?php _e("To unlock updates, please enter your license key below. If you don't have a licence key, please see",'acf'); ?> <a href="http://www.advancedcustomfields.com/pro" target="_blank"><?php _e('details & pricing', 'acf'); ?></a></p>
+			<p><?php _e("To unlock updates, please enter your license key below. If you don't have a licence key, please see", 'acf'); ?> <a href="http://www.advancedcustomfields.com/pro" target="_blank"><?php _e('details & pricing', 'acf'); ?></a></p>
 			<form action="" method="post">
 			<div class="acf-hidden">
-				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( $nonce ); ?>" />
+				<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce($nonce); ?>" />
 			</div>
 			<table class="form-table">
                 <tbody>
@@ -88,11 +88,11 @@ 
                     		<label><?php _e('Update Available', 'acf'); ?></label>
                     	</th>
 						<td>
-							<?php if( $update_available ): ?>
+							<?php if ($update_available): ?>
 								
 								<span style="margin-right: 5px;"><?php _e('Yes', 'acf'); ?></span>
 								
-								<?php if( $active ): ?>
+								<?php if ($active): ?>
 									<a class="acf-button blue" href="<?php echo admin_url('plugins.php?s=Advanced+Custom+Fields+Pro'); ?>"><?php _e('Update Plugin', 'acf'); ?></a>
 								<?php else: ?>
 									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf'); ?></a>
@@ -105,7 +105,7 @@ 
 							<?php endif; ?>
 						</td>
 					</tr>
-					<?php if( $changelog ): ?>
+					<?php if ($changelog): ?>
 					<tr>
                     	<th>
                     		<label><?php _e('Changelog', 'acf'); ?></label>
@@ -115,7 +115,7 @@ 
 						</td>
 					</tr>
 					<?php endif; ?>
-					<?php if( $upgrade_notice ): ?>
+					<?php if ($upgrade_notice): ?>
 					<tr>
                     	<th>
                     		<label><?php _e('Upgrade Notice', 'acf'); ?></label>

Braces +10 added lines, -4 removed lines

@@ -94,13 +94,19 @@
 								
 								<?php if( $active ): ?>
 									<a class="acf-button blue" href="<?php echo admin_url('plugins.php?s=Advanced+Custom+Fields+Pro'); ?>"><?php _e('Update Plugin', 'acf'); ?></a>
-								<?php else: ?>
-									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf'); ?></a>
+								<?php else {
+	: ?>
+									<a class="acf-button" disabled="disabled" href="#"><?php _e('Please enter your license key above to unlock updates', 'acf');
+}
+?></a>
 								<?php endif; ?>
 								
-							<?php else: ?>
+							<?php else {
+	: ?>
 								
-								<span style="margin-right: 5px;"><?php _e('No', 'acf'); ?></span>
+								<span style="margin-right: 5px;"><?php _e('No', 'acf');
+}
+?></span>
 								<a class="acf-button" href="<?php echo add_query_arg('force-check', 1); ?>"><?php _e('Check Again', 'acf'); ?></a>
 							<?php endif; ?>
 						</td>

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

Spacing +56 added lines, -56 removed lines

@@ -13,18 +13,18 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_valid_options_page( $page = '' ) {
+function acf_get_valid_options_page($page = '') {
 	
 	// allow for string
-	if( empty($page) ) {
+	if (empty($page)) {
 		
 		$page = array(
-			'page_title' 	=> __('Options','acf'),
-			'menu_title'	=> __('Options','acf'),
+			'page_title' 	=> __('Options', 'acf'),
+			'menu_title'	=> __('Options', 'acf'),
 			'menu_slug' 	=> 'acf-options',
 		);
 			
-	} elseif( is_string($page) ) {
+	} elseif (is_string($page)) {
 	
 		$page_title = $page;
 		
@@ -58,11 +58,11 @@ 
 		'parent'	=> 'parent_slug'
 	);
 	
-	foreach( $migrate as $old => $new ) {
+	foreach ($migrate as $old => $new) {
 		
-		if( !empty($page[ $old ]) ) {
+		if ( ! empty($page[$old])) {
 			
-			$page[ $new ] = acf_extract_var( $page, $old );
+			$page[$new] = acf_extract_var($page, $old);
 			
 		}
 		
@@ -70,7 +70,7 @@ 
 	
 	
 	// page_title (allows user to define page with just page_title or title)
-	if( empty($page['menu_title']) ) {
+	if (empty($page['menu_title'])) {
 	
 		$page['menu_title'] = $page['page_title'];
 		
@@ -78,9 +78,9 @@ 
 	
 	
 	// menu_slug
-	if( empty($page['menu_slug']) ) {
+	if (empty($page['menu_slug'])) {
 	
-		$page['menu_slug'] = 'acf-options-' . sanitize_title( $page['menu_title'] );
+		$page['menu_slug'] = 'acf-options-'.sanitize_title($page['menu_title']);
 		
 	}
 	
@@ -104,10 +104,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_get_options_page( $slug ) {
+function acf_get_options_page($slug) {
 	
 	// bail early if page doens't exist
-	if( empty($GLOBALS['acf_options_pages'][ $slug ]) ) {
+	if (empty($GLOBALS['acf_options_pages'][$slug])) {
 		
 		return false;
 		
@@ -115,7 +115,7 @@ 
 	
 	
 	// vars
-	$page = $GLOBALS['acf_options_pages'][ $slug ];
+	$page = $GLOBALS['acf_options_pages'][$slug];
 	
 					
 	// filter for 3rd party customization
@@ -148,7 +148,7 @@ 
 		
 		
 	// bail early if empty
-	if( empty($GLOBALS['acf_options_pages']) ) {
+	if (empty($GLOBALS['acf_options_pages'])) {
 		
 		return false;
 		
@@ -162,18 +162,18 @@ 
 	
 	
 	// get pages
-	foreach( $slugs as $slug ) {
+	foreach ($slugs as $slug) {
 	
 		// append
-		$pages[] = acf_get_options_page( $slug );
+		$pages[] = acf_get_options_page($slug);
 		
 	}
 	
 
-	foreach( $pages as $i => $page ) {
+	foreach ($pages as $i => $page) {
 			
 		// bail early if is child
-		if( !empty($page['parent_slug']) ) {
+		if ( ! empty($page['parent_slug'])) {
 			
 			continue;
 			
@@ -181,17 +181,17 @@ 
 		
 		
 		// add missing position
-		if( !$page['position']) {
+		if ( ! $page['position']) {
 			
 			$_wp_last_utility_menu++;
 			
-			$pages[ $i ]['position'] = $_wp_last_utility_menu;
+			$pages[$i]['position'] = $_wp_last_utility_menu;
 			
 		}
 	
 		
 		// bail early if no redirect
-		if( empty($page['redirect']) ) {
+		if (empty($page['redirect'])) {
 			
 			continue;
 			
@@ -204,10 +204,10 @@ 
 		
 		
 		// update children
-		foreach( $pages as $j => $sub_page ) {
+		foreach ($pages as $j => $sub_page) {
 			
 			// bail early if not child
-			if( $sub_page['parent_slug'] !== $parent ) {
+			if ($sub_page['parent_slug'] !== $parent) {
 				
 				continue;
 				
@@ -215,7 +215,7 @@ 
 			
 			
 			// update $child if empt
-			if( empty($child) ) {
+			if (empty($child)) {
 				
 				$child = $sub_page['menu_slug'];
 				
@@ -223,15 +223,15 @@ 
 			
 			
 			// update parent_slug
-			$pages[ $j ]['parent_slug'] = $child;
+			$pages[$j]['parent_slug'] = $child;
 			
 		}
 		
 		
 		// finally update parent menu_slug
-		if( $child ) {
+		if ($child) {
 			
-			$pages[ $i ]['menu_slug'] = $child;
+			$pages[$i]['menu_slug'] = $child;
 			
 		}
 		
@@ -257,10 +257,10 @@ 
 *  @return	$post_id (int)
 */
 
-function acf_update_options_page( $data ) {
+function acf_update_options_page($data) {
 	
 	// bail early if no menu_slug
-	if( empty($data['menu_slug']) ) {
+	if (empty($data['menu_slug'])) {
 		
 		return false;
 		
@@ -271,7 +271,7 @@ 
 	
 	
 	// bail early if no page found
-	if( empty($GLOBALS['acf_options_pages'][ $slug ]) ) {
+	if (empty($GLOBALS['acf_options_pages'][$slug])) {
 	
 		return false;
 		
@@ -279,7 +279,7 @@ 
 	
 	
 	// vars
-	$page = $GLOBALS['acf_options_pages'][ $slug ];
+	$page = $GLOBALS['acf_options_pages'][$slug];
 	
 	
 	// merge in data
@@ -287,7 +287,7 @@ 
 	
 	
 	// update
-	$GLOBALS['acf_options_pages'][ $slug ] = $page;
+	$GLOBALS['acf_options_pages'][$slug] = $page;
 	
 	
 	// return
@@ -309,16 +309,16 @@ 
 *  @return	$post_id (int)
 */
 
-if( ! function_exists('acf_add_options_page') ):
+if ( ! function_exists('acf_add_options_page')):
 
-function acf_add_options_page( $page = '' ) {
+function acf_add_options_page($page = '') {
 	
 	// validate
-	$page = acf_get_valid_options_page( $page );
+	$page = acf_get_valid_options_page($page);
 	
 	
 	// instantiate globals
-	if( empty($GLOBALS['acf_options_pages']) ) {
+	if (empty($GLOBALS['acf_options_pages'])) {
 	
 		$GLOBALS['acf_options_pages'] = array();
 		
@@ -326,15 +326,15 @@ 
 	
 	
 	// update if already exists
-	if( acf_get_options_page($page['menu_slug']) ) {
+	if (acf_get_options_page($page['menu_slug'])) {
 		
-		return acf_update_options_page( $page );
+		return acf_update_options_page($page);
 		
 	}
 	
 	
 	// append
-	$GLOBALS['acf_options_pages'][ $page['menu_slug'] ] = $page;
+	$GLOBALS['acf_options_pages'][$page['menu_slug']] = $page;
 	
 	
 	// return
@@ -358,16 +358,16 @@ 
 *  @return	$post_id (int)
 */
 
-if( ! function_exists('acf_add_options_sub_page') ):
+if ( ! function_exists('acf_add_options_sub_page')):
 
-function acf_add_options_sub_page( $page = '' ) {
+function acf_add_options_sub_page($page = '') {
 	
 	// validate
-	$page = acf_get_valid_options_page( $page );
+	$page = acf_get_valid_options_page($page);
 	
 	
 	// parent
-	if( !$page['parent_slug'] ) {
+	if ( ! $page['parent_slug']) {
 		
 		// set parent slug
 		$page['parent_slug'] = 'acf-options';
@@ -376,9 +376,9 @@ 
 	
 	
 	// create default parent if not yet exists
-	if( $page['parent_slug'] === 'acf-options' ) {
+	if ($page['parent_slug'] === 'acf-options') {
 		
-		if( !acf_get_options_page('acf-options') ) {
+		if ( ! acf_get_options_page('acf-options')) {
 			
 			acf_add_options_page();
 			
@@ -388,7 +388,7 @@ 
 		
 	
 	// return
-	return acf_add_options_page( $page );
+	return acf_add_options_page($page);
 	
 }
 
@@ -408,9 +408,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_title') ):
+if ( ! function_exists('acf_set_options_page_title')):
 
-function acf_set_options_page_title( $title = 'Options' ) {
+function acf_set_options_page_title($title = 'Options') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -436,9 +436,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_menu') ):
+if ( ! function_exists('acf_set_options_page_menu')):
 
-function acf_set_options_page_menu( $title = 'Options' ) {
+function acf_set_options_page_menu($title = 'Options') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -463,9 +463,9 @@ 
 *  @return	n/a
 */
 
-if( ! function_exists('acf_set_options_page_capability') ):
+if ( ! function_exists('acf_set_options_page_capability')):
 
-function acf_set_options_page_capability( $capability = 'edit_posts' ) {
+function acf_set_options_page_capability($capability = 'edit_posts') {
 	
 	acf_update_options_page(array(
 		'menu_slug'		=> 'acf-options',
@@ -490,11 +490,11 @@ 
 *  @return	N/A
 */
 
-if( ! function_exists('register_options_page') ):
+if ( ! function_exists('register_options_page')):
 
-function register_options_page( $title = false ) {
+function register_options_page($title = false) {
 
-	acf_add_options_sub_page( $title );
+	acf_add_options_sub_page($title);
 	
 }
 

includes/acf/pro/core/updates.php

Indentation +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
 		
 		// append plugin information
 		// Note: is_admin() was used previously, however this prevents jetpack manage & ManageWP from working
-	    add_filter('plugins_api', array($this, 'inject_info'), 20, 3);
+		add_filter('plugins_api', array($this, 'inject_info'), 20, 3);
 	    
 	    
 		// append update information
@@ -59,33 +59,33 @@ 
         
         
 		// validate
-    	if( isset($args->slug) && $args->slug == $slug ) {
+		if( isset($args->slug) && $args->slug == $slug ) {
 	    	
-	    	$info = acf_pro_get_remote_info();
-	    	$sections = acf_extract_vars($info, array(
-	    		'description',
-	    		'installation',
-	    		'changelog',
-	    		'upgrade_notice',
-	    	));
+			$info = acf_pro_get_remote_info();
+			$sections = acf_extract_vars($info, array(
+				'description',
+				'installation',
+				'changelog',
+				'upgrade_notice',
+			));
 	    	
-	    	$obj = new stdClass();
+			$obj = new stdClass();
 		
-		    foreach( $info as $k => $v ) {
+			foreach( $info as $k => $v ) {
 			    
-		        $obj->$k = $v;
+				$obj->$k = $v;
 		        
-		    }
+			}
 		    
-		    $obj->sections = $sections;
+			$obj->sections = $sections;
 
-		    return $obj;
+			return $obj;
 		    
-    	}
+		}
     	
     	
-    	// return        
-        return $result;
+		// return        
+		return $result;
         
 	}
 	
@@ -133,22 +133,22 @@ 
 		}
 		
 		 
-        // vars
+		// vars
 		$info = acf_pro_get_remote_info();
 		$basename = acf_get_setting('basename');
 		$slug = acf_get_setting('slug');
 		
 		
-        // create new object for update
-        $obj = new stdClass();
-        $obj->slug = $slug;
-        $obj->plugin = $basename;
-        $obj->new_version = $info['version'];
-        $obj->url = $info['homepage'];
-        $obj->package = '';
+		// create new object for update
+		$obj = new stdClass();
+		$obj->slug = $slug;
+		$obj->plugin = $basename;
+		$obj->new_version = $info['version'];
+		$obj->url = $info['homepage'];
+		$obj->package = '';
         
         
-        // license
+		// license
 		if( acf_pro_is_license_active() ) {
 			
 			$obj->package = acf_pro_get_remote_url('download', array(
@@ -161,12 +161,12 @@ 
 		}
 		
         
-        // add to transient
-        $transient->response[ $basename ] = $obj;
+		// add to transient
+		$transient->response[ $basename ] = $obj;
         
 		
 		// return 
-        return $transient;
+		return $transient;
         
 	}
 	

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php 
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if( ! class_exists('acf_pro_updates') ) :
+if ( ! class_exists('acf_pro_updates')) :
 
 class acf_pro_updates {
 	
@@ -32,7 +32,7 @@ 
 		
 		
 		// add custom message when PRO not activated but update available
-		add_action('in_plugin_update_message-' . acf_get_setting('basename'), array($this, 'in_plugin_update_message'), 10, 2 );
+		add_action('in_plugin_update_message-'.acf_get_setting('basename'), array($this, 'in_plugin_update_message'), 10, 2);
 			
 	}
 	
@@ -52,14 +52,14 @@ 
 	*  @return	$result
 	*/
 	
-	function inject_info( $result, $action = null, $args = null ) {
+	function inject_info($result, $action = null, $args = null) {
 		
 		// vars
 		$slug = acf_get_setting('slug');
         
         
 		// validate
-    	if( isset($args->slug) && $args->slug == $slug ) {
+    	if (isset($args->slug) && $args->slug == $slug) {
 	    	
 	    	$info = acf_pro_get_remote_info();
 	    	$sections = acf_extract_vars($info, array(
@@ -71,7 +71,7 @@ 
 	    	
 	    	$obj = new stdClass();
 		
-		    foreach( $info as $k => $v ) {
+		    foreach ($info as $k => $v) {
 			    
 		        $obj->$k = $v;
 		        
@@ -103,14 +103,14 @@ 
 	*  @return	$transient
 	*/
 	
-	function inject_update( $transient ) {
+	function inject_update($transient) {
 		
 		// vars
 		$basename = acf_get_setting('basename');
 		
 		
 		// bail early if no show_updates
-		if( !acf_get_setting('show_updates') ) {
+		if ( ! acf_get_setting('show_updates')) {
 			
 			return $transient;
 			
@@ -118,7 +118,7 @@ 
 		
 		
 		// bail early if not a plugin (included in theme)
-		if( !is_plugin_active($basename) ) {
+		if ( ! is_plugin_active($basename)) {
 			
 			return;
 			
@@ -126,7 +126,7 @@ 
 		
 				
 		// bail early if no update available
-		if( !acf_pro_is_update_available() ) {
+		if ( ! acf_pro_is_update_available()) {
 			
 			return $transient;
 			
@@ -149,7 +149,7 @@ 
         
         
         // license
-		if( acf_pro_is_license_active() ) {
+		if (acf_pro_is_license_active()) {
 			
 			$obj->package = acf_pro_get_remote_url('download', array(
 				'k'				=> acf_pro_get_license(),
@@ -162,7 +162,7 @@ 
 		
         
         // add to transient
-        $transient->response[ $basename ] = $obj;
+        $transient->response[$basename] = $obj;
         
 		
 		// return 
@@ -184,10 +184,10 @@ 
 	*  @param	{object}	$r
 	*/
 
-	function in_plugin_update_message( $plugin_data, $r ) {
+	function in_plugin_update_message($plugin_data, $r) {
 		
 		// validate
-		if( acf_pro_is_license_active() ) {
+		if (acf_pro_is_license_active()) {
 			
 			return;
 			
@@ -199,7 +199,7 @@ 
 		
 		
 		// show message
-		echo '<br />' . sprintf( $m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'http://www.advancedcustomfields.com/pro');
+		echo '<br />'.sprintf($m, admin_url('edit.php?post_type=acf-field-group&page=acf-settings-updates'), 'http://www.advancedcustomfields.com/pro');
 	
 	}
 	

Braces +4 added lines, -1 removed lines

@@ -1,6 +1,9 @@
 <?php 
 
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 if( ! class_exists('acf_pro_updates') ) :
 

includes/acf/pro/fields/flexible-content.php

Spacing +163 added lines, -163 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_flexible_content') ) :
+if ( ! class_exists('acf_field_flexible_content')) :
 
 class acf_field_flexible_content extends acf_field {
 	
@@ -33,24 +33,24 @@ 
 		
 		// vars
 		$this->name = 'flexible_content';
-		$this->label = __("Flexible Content",'acf');
+		$this->label = __("Flexible Content", 'acf');
 		$this->category = 'layout';
 		$this->defaults = array(
 			'layouts'		=> array(),
 			'min'			=> '',
 			'max'			=> '',
-			'button_label'	=> __("Add Row",'acf'),
+			'button_label'	=> __("Add Row", 'acf'),
 		);
 		$this->l10n = array(
 			'layout' 		=> __("layout", 'acf'),
 			'layouts'		=> __("layouts", 'acf'),
 			'remove'		=> __("remove {layout}?", 'acf'),
-			'min'			=> __("This field requires at least {min} {identifier}",'acf'),
-			'max'			=> __("This field has a limit of {max} {identifier}",'acf'),
-			'min_layout'	=> __("This field requires at least {min} {label} {identifier}",'acf'),
-			'max_layout'	=> __("Maximum {label} limit reached ({max} {identifier})",'acf'),
-			'available'		=> __("{available} {label} {identifier} available (max {max})",'acf'),
-			'required'		=> __("{required} {label} {identifier} required (min {min})",'acf'),
+			'min'			=> __("This field requires at least {min} {identifier}", 'acf'),
+			'max'			=> __("This field has a limit of {max} {identifier}", 'acf'),
+			'min_layout'	=> __("This field requires at least {min} {label} {identifier}", 'acf'),
+			'max_layout'	=> __("Maximum {label} limit reached ({max} {identifier})", 'acf'),
+			'available'		=> __("{available} {label} {identifier} available (max {max})", 'acf'),
+			'required'		=> __("{required} {label} {identifier} required (min {min})", 'acf'),
 		);		
 		
 		
@@ -73,7 +73,7 @@ 
 	*  @return	$layout (array)
 	*/
 	
-	function get_valid_layout( $layout = array() ) {
+	function get_valid_layout($layout = array()) {
 		
 		// parse
 		$layout = wp_parse_args($layout, array(
@@ -106,10 +106,10 @@ 
 	*  @return	$field - the field array holding all the field options
 	*/
 	
-	function load_field( $field ) {
+	function load_field($field) {
 		
 		// bail early if no field layouts
-		if( empty($field['layouts']) ) {
+		if (empty($field['layouts'])) {
 			
 			return $field;
 			
@@ -121,34 +121,34 @@ 
 		
 		
 		// loop through layouts, sub fields and swap out the field key with the real field
-		foreach( array_keys($field['layouts']) as $i ) {
+		foreach (array_keys($field['layouts']) as $i) {
 			
 			// extract layout
-			$layout = acf_extract_var( $field['layouts'], $i );
+			$layout = acf_extract_var($field['layouts'], $i);
 			
 			
 			// validate layout
-			$layout = $this->get_valid_layout( $layout );
+			$layout = $this->get_valid_layout($layout);
 			
 			
 			// append sub fields
-			if( !empty($sub_fields) ) {
+			if ( ! empty($sub_fields)) {
 				
-				foreach( array_keys($sub_fields) as $k ) {
+				foreach (array_keys($sub_fields) as $k) {
 					
 					// check if 'parent_layout' is empty
-					if( empty($sub_fields[ $k ]['parent_layout']) ) {
+					if (empty($sub_fields[$k]['parent_layout'])) {
 					
 						// parent_layout did not save for this field, default it to first layout
-						$sub_fields[ $k ]['parent_layout'] = $layout['key'];
+						$sub_fields[$k]['parent_layout'] = $layout['key'];
 						
 					}
 					
 					
 					// append sub field to layout, 
-					if( $sub_fields[ $k ]['parent_layout'] == $layout['key'] ) {
+					if ($sub_fields[$k]['parent_layout'] == $layout['key']) {
 					
-						$layout['sub_fields'][] = acf_extract_var( $sub_fields, $k );
+						$layout['sub_fields'][] = acf_extract_var($sub_fields, $k);
 						
 					}
 					
@@ -158,7 +158,7 @@ 
 			
 			
 			// append back to layouts
-			$field['layouts'][ $i ] = $layout;
+			$field['layouts'][$i] = $layout;
 			
 		}
 		
@@ -180,10 +180,10 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 	
 		// defaults
-		if( empty($field['button_label']) ) {
+		if (empty($field['button_label'])) {
 		
 			$field['button_label'] = $this->defaults['button_label'];
 			
@@ -193,9 +193,9 @@ 
 		// sort layouts into names
 		$layouts = array();
 		
-		foreach( $field['layouts'] as $k => $layout ) {
+		foreach ($field['layouts'] as $k => $layout) {
 		
-			$layouts[ $layout['name'] ] = acf_extract_var( $field['layouts'], $k );
+			$layouts[$layout['name']] = acf_extract_var($field['layouts'], $k);
 			
 		}
 		
@@ -208,34 +208,34 @@ 
 		
 		
 		// no value message
-		$no_value_message = __('Click the "%s" button below to start creating your layout','acf');
+		$no_value_message = __('Click the "%s" button below to start creating your layout', 'acf');
 		$no_value_message = apply_filters('acf/fields/flexible_content/no_value_message', $no_value_message, $field);
 
 ?>
-<div <?php acf_esc_attr_e(array( 'class' => 'acf-flexible-content', 'data-min' => $field['min'], 'data-max'	=> $field['max'] )); ?>>
+<div <?php acf_esc_attr_e(array('class' => 'acf-flexible-content', 'data-min' => $field['min'], 'data-max'	=> $field['max'])); ?>>
 	
-	<div class="no-value-message" <?php if( $field['value'] ){ echo 'style="display:none;"'; } ?>>
-		<?php printf( $no_value_message, $field['button_label'] ); ?>
+	<div class="no-value-message" <?php if ($field['value']) { echo 'style="display:none;"'; } ?>>
+		<?php printf($no_value_message, $field['button_label']); ?>
 	</div>
 	
 	<div class="clones">
-		<?php foreach( $layouts as $layout ): ?>
-			<?php $this->render_layout( $field, $layout, 'acfcloneindex', array() ); ?>
+		<?php foreach ($layouts as $layout): ?>
+			<?php $this->render_layout($field, $layout, 'acfcloneindex', array()); ?>
 		<?php endforeach; ?>
 	</div>
 	<div class="values">
-		<?php if( !empty($field['value']) ): ?>
-			<?php foreach( $field['value'] as $i => $value ): ?>
+		<?php if ( ! empty($field['value'])): ?>
+			<?php foreach ($field['value'] as $i => $value): ?>
 				<?php 
 				
 				// validate
-				if( empty($layouts[ $value['acf_fc_layout'] ]) ) {
+				if (empty($layouts[$value['acf_fc_layout']])) {
 				
 					continue;
 					
 				}
 
-				$this->render_layout( $field, $layouts[ $value['acf_fc_layout'] ], $i, $value );
+				$this->render_layout($field, $layouts[$value['acf_fc_layout']], $i, $value);
 				
 				?>
 			<?php endforeach; ?>
@@ -251,7 +251,7 @@ 
 	<script type="text-html" class="tmpl-popup"><?php 
 		?><div class="acf-fc-popup">
 			<ul>
-				<?php foreach( $layouts as $layout ): 
+				<?php foreach ($layouts as $layout): 
 					
 					$atts = array(
 						'data-layout'	=> $layout['name'],
@@ -261,7 +261,7 @@ 
 					
 					?>
 					<li>
-						<a href="#" <?php acf_esc_attr_e( $atts ); ?>><?php echo $layout['label']; ?><span class="status"></span></a>
+						<a href="#" <?php acf_esc_attr_e($atts); ?>><?php echo $layout['label']; ?><span class="status"></span></a>
 					</li>
 				<?php endforeach; ?>
 			</ul>
@@ -288,7 +288,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function render_layout( $field, $layout, $i, $value ) {
+	function render_layout($field, $layout, $i, $value) {
 		
 		// vars
 		$order = 0;
@@ -301,16 +301,16 @@ 
 		
 	
 		// collapsed
-		$collapsed = acf_get_user_setting('collapsed_' . $field['key'], '');
+		$collapsed = acf_get_user_setting('collapsed_'.$field['key'], '');
 		
 		
 		// cookie fallback ( version < 5.3.2 )
-		if( $collapsed === '' ) {
+		if ($collapsed === '') {
 			
 			$collapsed = acf_extract_var($_COOKIE, "acf_collapsed_{$field['key']}", '');
 			$collapsed = str_replace('|', ',', $collapsed);
 			
-			acf_update_user_setting( 'collapsed_' . $field['key'], $collapsed );
+			acf_update_user_setting('collapsed_'.$field['key'], $collapsed);
 				
 		}
 		
@@ -321,7 +321,7 @@ 
 			
 		
 		// collapsed class
-		if( in_array($i, $collapsed) ) {
+		if (in_array($i, $collapsed)) {
 			
 			$div['class'] .= ' -collapsed';
 			
@@ -329,7 +329,7 @@ 
 		
 		
 		// clone
-		if( is_numeric($i) ) {
+		if (is_numeric($i)) {
 			
 			$order = $i + 1;
 			
@@ -344,7 +344,7 @@ 
 <div <?php acf_esc_attr_e($div); ?>>
 			
 	<div class="acf-hidden">
-		<?php acf_hidden_input(array( 'name' => "{$field['name']}[{$i}][acf_fc_layout]", 'value' => $layout['name'] )); ?>
+		<?php acf_hidden_input(array('name' => "{$field['name']}[{$i}][acf_fc_layout]", 'value' => $layout['name'])); ?>
 	</div>
 	
 	<div class="acf-fc-layout-handle">
@@ -353,19 +353,19 @@ 
 	
 	<ul class="acf-fc-layout-controlls acf-hl">
 		<li class="acf-fc-show-on-hover">
-			<a class="acf-icon -plus small" href="#" data-event="add-layout" title="<?php _e('Add layout','acf'); ?>"></a>
+			<a class="acf-icon -plus small" href="#" data-event="add-layout" title="<?php _e('Add layout', 'acf'); ?>"></a>
 		</li>
 		<li class="acf-fc-show-on-hover">
-			<a class="acf-icon -minus small" href="#" data-event="remove-layout" title="<?php _e('Remove layout','acf'); ?>"></a>
+			<a class="acf-icon -minus small" href="#" data-event="remove-layout" title="<?php _e('Remove layout', 'acf'); ?>"></a>
 		</li>
 		<li>
-			<a class="acf-icon -collapse small" href="#" data-event="collapse-layout" title="<?php _e('Click to toggle','acf'); ?>"></a>
+			<a class="acf-icon -collapse small" href="#" data-event="collapse-layout" title="<?php _e('Click to toggle', 'acf'); ?>"></a>
 		</li>
 	</ul>
 	
-<?php if( !empty($layout['sub_fields']) ): ?>
+<?php if ( ! empty($layout['sub_fields'])): ?>
 	
-	<?php if( $layout['display'] == 'table' ): 
+	<?php if ($layout['display'] == 'table'): 
 		
 		// update vars
 		$el = 'td';
@@ -375,7 +375,7 @@ 
 		
 		<thead>
 			<tr>
-				<?php foreach( $layout['sub_fields'] as $sub_field ): 
+				<?php foreach ($layout['sub_fields'] as $sub_field): 
 					
 					$atts = array(
 						'class'		=> "acf-th acf-th-{$sub_field['name']}",
@@ -384,16 +384,16 @@ 
 					
 					
 					// Add custom width
-					if( $sub_field['wrapper']['width'] ) {
+					if ($sub_field['wrapper']['width']) {
 					
 						$atts['data-width'] = $sub_field['wrapper']['width'];
 						
 					}
 						
 					?>
-					<th <?php acf_esc_attr_e( $atts ); ?>>
-						<?php echo acf_get_field_label( $sub_field ); ?>
-						<?php if( $sub_field['instructions'] ): ?>
+					<th <?php acf_esc_attr_e($atts); ?>>
+						<?php echo acf_get_field_label($sub_field); ?>
+						<?php if ($sub_field['instructions']): ?>
 							<p class="description"><?php echo $sub_field['instructions']; ?></p>
 						<?php endif; ?>
 					</th>
@@ -404,16 +404,16 @@ 
 		
 		<tbody>
 	<?php else: ?>
-	<div class="acf-fields <?php if($layout['display'] == 'row'): ?>-left<?php endif; ?>">
+	<div class="acf-fields <?php if ($layout['display'] == 'row'): ?>-left<?php endif; ?>">
 	<?php endif; ?>
 	
 		<?php
 			
 		// loop though sub fields
-		foreach( $layout['sub_fields'] as $sub_field ) {
+		foreach ($layout['sub_fields'] as $sub_field) {
 			
 			// prevent repeater field from creating multiple conditional logic items for each row
-			if( $i !== 'acfcloneindex' ) {
+			if ($i !== 'acfcloneindex') {
 				
 				$sub_field['conditional_logic'] = 0;
 				
@@ -421,12 +421,12 @@ 
 			
 			
 			// add value
-			if( isset($value[ $sub_field['key'] ]) ) {
+			if (isset($value[$sub_field['key']])) {
 				
 				// this is a normal value
-				$sub_field['value'] = $value[ $sub_field['key'] ];
+				$sub_field['value'] = $value[$sub_field['key']];
 				
-			} elseif( isset($sub_field['default_value']) ) {
+			} elseif (isset($sub_field['default_value'])) {
 				
 				// no value, but this sub field has a default value
 				$sub_field['value'] = $sub_field['default_value'];
@@ -439,13 +439,13 @@ 
 			
 			
 			// render input
-			acf_render_field_wrap( $sub_field, $el );
+			acf_render_field_wrap($sub_field, $el);
 		
 		}
 		
 		?>
 			
-	<?php if( $layout['display'] == 'table' ): ?>
+	<?php if ($layout['display'] == 'table'): ?>
 		</tbody>
 	</table>
 	<?php else: ?>
@@ -473,10 +473,10 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// load default layout
-		if( empty($field['layouts']) ) {
+		if (empty($field['layouts'])) {
 		
 			$field['layouts'] = array();
 			$field['layouts'][] = $this->get_valid_layout();
@@ -485,10 +485,10 @@ 
 		
 		
 		// loop through layouts
-		foreach( $field['layouts'] as $layout ) {
+		foreach ($field['layouts'] as $layout) {
 			
 			// get valid layout
-			$layout = $this->get_valid_layout( $layout );
+			$layout = $this->get_valid_layout($layout);
 			
 			
 			// vars
@@ -497,12 +497,12 @@ 
 			
 ?><tr class="acf-field" data-name="fc_layout" data-setting="flexible_content" data-id="<?php echo $layout['key']; ?>">
 	<td class="acf-label">
-		<label><?php _e("Layout",'acf'); ?></label>
+		<label><?php _e("Layout", 'acf'); ?></label>
 		<p class="description acf-fl-actions">
-			<a data-name="acf-fc-reorder" title="<?php _e("Reorder Layout",'acf'); ?>" ><?php _e("Reorder",'acf'); ?></a>
-			<a data-name="acf-fc-delete" title="<?php _e("Delete Layout",'acf'); ?>" href="#"><?php _e("Delete",'acf'); ?></a>
-			<a data-name="acf-fc-duplicate" title="<?php _e("Duplicate Layout",'acf'); ?>" href="#"><?php _e("Duplicate",'acf'); ?></a>
-			<a data-name="acf-fc-add" title="<?php _e("Add New Layout",'acf'); ?>" href="#"><?php _e("Add New",'acf'); ?></a>
+			<a data-name="acf-fc-reorder" title="<?php _e("Reorder Layout", 'acf'); ?>" ><?php _e("Reorder", 'acf'); ?></a>
+			<a data-name="acf-fc-delete" title="<?php _e("Delete Layout", 'acf'); ?>" href="#"><?php _e("Delete", 'acf'); ?></a>
+			<a data-name="acf-fc-duplicate" title="<?php _e("Duplicate Layout", 'acf'); ?>" href="#"><?php _e("Duplicate", 'acf'); ?></a>
+			<a data-name="acf-fc-add" title="<?php _e("Add New Layout", 'acf'); ?>" href="#"><?php _e("Add New", 'acf'); ?></a>
 		</p>
 	</td>
 	<td class="acf-input">
@@ -527,7 +527,7 @@ 
 					'name'		=> 'label',
 					'prefix'	=> $layout_prefix,
 					'value'		=> $layout['label'],
-					'prepend'	=> __('Label','acf')
+					'prepend'	=> __('Label', 'acf')
 				));
 				
 				?>
@@ -540,13 +540,13 @@ 
 					'name'		=> 'name',
 					'prefix'	=> $layout_prefix,
 					'value'		=> $layout['name'],
-					'prepend'	=> __('Name','acf')
+					'prepend'	=> __('Name', 'acf')
 				));
 				
 				?>
 			</li>
 			<li class="acf-fc-meta-display">
-				<div class="acf-input-prepend"><?php _e('Layout','acf'); ?></div>
+				<div class="acf-input-prepend"><?php _e('Layout', 'acf'); ?></div>
 				<div class="acf-input-wrap select">
 					<?php 
 					
@@ -556,9 +556,9 @@ 
 						'prefix'	=> $layout_prefix,
 						'value'		=> $layout['display'],
 						'choices'	=> array(
-							'table'			=> __('Table','acf'),
-							'block'			=> __('Block','acf'),
-							'row'			=> __('Row','acf')
+							'table'			=> __('Table', 'acf'),
+							'block'			=> __('Block', 'acf'),
+							'row'			=> __('Row', 'acf')
 						),
 					));
 					
@@ -573,7 +573,7 @@ 
 					'name'		=> 'min',
 					'prefix'	=> $layout_prefix,
 					'value'		=> $layout['min'],
-					'prepend'	=> __('Min','acf')
+					'prepend'	=> __('Min', 'acf')
 				));
 				
 				?>
@@ -586,7 +586,7 @@ 
 					'name'		=> 'max',
 					'prefix'	=> $layout_prefix,
 					'value'		=> $layout['max'],
-					'prepend'	=> __('Max','acf')
+					'prepend'	=> __('Max', 'acf')
 				));
 				
 				?>
@@ -613,8 +613,8 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Button Label','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Button Label', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'text',
 			'name'			=> 'button_label',
@@ -622,8 +622,8 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum Layouts','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum Layouts', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'min',
@@ -631,8 +631,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum Layouts','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum Layouts', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'max',
@@ -656,10 +656,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) || empty($field['layouts']) ) {
+		if (empty($value) || empty($field['layouts'])) {
 			
 			return $value;
 			
@@ -667,7 +667,7 @@ 
 		
 		
 		// value must be an array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// vars
@@ -677,28 +677,28 @@ 
 		// populate $layouts
 		$layouts = array();
 		
-		foreach( array_keys($field['layouts']) as $i ) {
+		foreach (array_keys($field['layouts']) as $i) {
 			
 			// get layout
-			$layout = $field['layouts'][ $i ];
+			$layout = $field['layouts'][$i];
 			
 			
 			// append to $layouts
-			$layouts[ $layout['name'] ] = $layout['sub_fields'];
+			$layouts[$layout['name']] = $layout['sub_fields'];
 			
 		}
 	
 		
 		// loop through rows
-		foreach( $value as $i => $l ) {
+		foreach ($value as $i => $l) {
 			
 			// append to $values
-			$rows[ $i ] = array();
-			$rows[ $i ]['acf_fc_layout'] = $l;
+			$rows[$i] = array();
+			$rows[$i]['acf_fc_layout'] = $l;
 			
 			
 			// bail early if layout deosnt contain sub fields
-			if( empty($layouts[ $l ]) ) {
+			if (empty($layouts[$l])) {
 				
 				continue;
 				
@@ -706,14 +706,14 @@ 
 			
 			
 			// get layout
-			$layout = $layouts[ $l ];
+			$layout = $layouts[$l];
 			
 			
 			// loop through sub fields
-			foreach( array_keys($layout) as $j ) {
+			foreach (array_keys($layout) as $j) {
 				
 				// get sub field
-				$sub_field = $layout[ $j ];
+				$sub_field = $layout[$j];
 				
 				
 				// update full name
@@ -721,11 +721,11 @@ 
 				
 				
 				// get value
-				$sub_value = acf_get_value( $post_id, $sub_field );
+				$sub_value = acf_get_value($post_id, $sub_field);
 				
 				
 				// add value
-				$rows[ $i ][ $sub_field['key'] ] = $sub_value;
+				$rows[$i][$sub_field['key']] = $sub_value;
 				
 			}
 			// foreach
@@ -757,10 +757,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) || empty($field['layouts']) ) {
+		if (empty($value) || empty($field['layouts'])) {
 			
 			return false;
 			
@@ -770,27 +770,27 @@ 
 		// populate $layouts
 		$layouts = array();
 		
-		foreach( array_keys($field['layouts']) as $i ) {
+		foreach (array_keys($field['layouts']) as $i) {
 			
 			// get layout
-			$layout = $field['layouts'][ $i ];
+			$layout = $field['layouts'][$i];
 			
 			
 			// append to $layouts
-			$layouts[ $layout['name'] ] = $layout['sub_fields'];
+			$layouts[$layout['name']] = $layout['sub_fields'];
 			
 		}
 		
 		
 		// loop over rows
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
 			// get layout name
-			$l = $value[ $i ]['acf_fc_layout'];
+			$l = $value[$i]['acf_fc_layout'];
 			
 			
 			// bail early if layout deosnt exist
-			if( empty($layouts[ $l ]) ) {
+			if (empty($layouts[$l])) {
 				
 				continue;
 				
@@ -798,26 +798,26 @@ 
 			
 			
 			// get layout
-			$layout = $layouts[ $l ];
+			$layout = $layouts[$l];
 			
 			
 			// loop through sub fields
-			foreach( array_keys($layout) as $j ) {
+			foreach (array_keys($layout) as $j) {
 				
 				// get sub field
-				$sub_field = $layout[ $j ];
+				$sub_field = $layout[$j];
 				
 				
 				// extract value
-				$sub_value = acf_extract_var( $value[ $i ], $sub_field['key'] );
+				$sub_value = acf_extract_var($value[$i], $sub_field['key']);
 				
 				
 				// format value
-				$sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
+				$sub_value = acf_format_value($sub_value, $post_id, $sub_field);
 				
 				
 				// append to $row
-				$value[ $i ][ $sub_field['name'] ] = $sub_value;
+				$value[$i][$sub_field['name']] = $sub_value;
 				
 			}
 			
@@ -842,10 +842,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// remove acfcloneindex
-		if( isset($value['acfcloneindex']) ) {
+		if (isset($value['acfcloneindex'])) {
 		
 			unset($value['acfcloneindex']);
 			
@@ -853,7 +853,7 @@ 
 		
 		
 		// valid
-		if( $field['required'] && empty($value) ) {
+		if ($field['required'] && empty($value)) {
 		
 			$valid = false;
 			
@@ -863,37 +863,37 @@ 
 		// populate $layouts
 		$layouts = array();
 		
-		foreach( array_keys($field['layouts']) as $i ) {
+		foreach (array_keys($field['layouts']) as $i) {
 			
 			$layout = acf_extract_var($field['layouts'], $i);
 			
 			// append to $layouts
-			$layouts[ $layout['name'] ] = $layout['sub_fields'];
+			$layouts[$layout['name']] = $layout['sub_fields'];
 			
 		}	
 		
 		
 		// check sub fields
-		if( !empty($value) ) {
+		if ( ! empty($value)) {
 			
 			// loop through rows
-			foreach( $value as $i => $row ) {	
+			foreach ($value as $i => $row) {	
 				
 				// get layout
 				$l = $row['acf_fc_layout'];
 				
 				
 				// loop through sub fields
-				if( !empty($layouts[ $l ]) ) {
+				if ( ! empty($layouts[$l])) {
 					
-					foreach( $layouts[ $l ] as $sub_field ) {
+					foreach ($layouts[$l] as $sub_field) {
 						
 						// get sub field key
 						$k = $sub_field['key'];
 						
 						
 						// exists?
-						if( ! isset($value[ $i ][ $k ]) ) {
+						if ( ! isset($value[$i][$k])) {
 							
 							continue;
 							
@@ -901,7 +901,7 @@ 
 						
 						
 						// validate
-						acf_validate_value( $value[ $i ][ $k ], $sub_field, "{$input}[{$i}][{$k}]" );
+						acf_validate_value($value[$i][$k], $sub_field, "{$input}[{$i}][{$k}]");
 					
 					}
 					// foreach
@@ -938,10 +938,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// remove acfcloneindex
-		if( isset($value['acfcloneindex']) ) {
+		if (isset($value['acfcloneindex'])) {
 		
 			unset($value['acfcloneindex']);
 			
@@ -954,22 +954,22 @@ 
 		
 		
 		// populate $layouts
-		foreach( $field['layouts'] as $layout ) {
+		foreach ($field['layouts'] as $layout) {
 			
-			$layouts[ $layout['name'] ] = $layout['sub_fields'];
+			$layouts[$layout['name']] = $layout['sub_fields'];
 			
 		}
 		
 		
 		// update sub fields
-		if( !empty($value) ) {
+		if ( ! empty($value)) {
 			
 			// $i
 			$i = -1;
 			
 			
 			// loop through rows
-			foreach( $value as $row ) {	
+			foreach ($value as $row) {	
 				
 				// $i
 				$i++;
@@ -984,22 +984,22 @@ 
 				
 				
 				// loop through sub fields
-				if( !empty($layouts[ $l ]) ) {
+				if ( ! empty($layouts[$l])) {
 					
-					foreach( $layouts[ $l ] as $sub_field ) {
+					foreach ($layouts[$l] as $sub_field) {
 						
 						// value
 						$v = false;
 						
 						
 						// key (backend)
-						if( isset($row[ $sub_field['key'] ]) ) {
+						if (isset($row[$sub_field['key']])) {
 							
-							$v = $row[ $sub_field['key'] ];
+							$v = $row[$sub_field['key']];
 							
-						} elseif( isset($row[ $sub_field['name'] ]) ) {
+						} elseif (isset($row[$sub_field['name']])) {
 							
-							$v = $row[ $sub_field['name'] ];
+							$v = $row[$sub_field['name']];
 							
 						} else {
 							
@@ -1014,7 +1014,7 @@ 
 						
 						
 						// update field
-						acf_update_value( $v, $post_id, $sub_field );
+						acf_update_value($v, $post_id, $sub_field);
 						
 					}
 					// foreach
@@ -1030,30 +1030,30 @@ 
 		
 		
 		// remove old data
-		$old_order = acf_get_metadata( $post_id, $field['name'] );
+		$old_order = acf_get_metadata($post_id, $field['name']);
 		$old_count = empty($old_order) ? 0 : count($old_order);
 		$new_count = empty($order) ? 0 : count($order);
 		
 		
-		if( $old_count > $new_count ) {
+		if ($old_count > $new_count) {
 			
-			for( $i = $new_count; $i < $old_count; $i++ ) {
+			for ($i = $new_count; $i < $old_count; $i++) {
 				
 				// get layout
-				$l = $old_order[ $i ];
+				$l = $old_order[$i];
 				
 				
 				// loop through sub fields
-				if( !empty($layouts[ $l ]) ) {
+				if ( ! empty($layouts[$l])) {
 					
-					foreach( $layouts[ $l ] as $sub_field ) {
+					foreach ($layouts[$l] as $sub_field) {
 						
 						// modify name for delete
 						$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
 						
 						
 						// delete value
-						acf_delete_value( $post_id, $sub_field );
+						acf_delete_value($post_id, $sub_field);
 						
 					}
 					
@@ -1065,7 +1065,7 @@ 
 
 		
 		// save false for empty value
-		if( empty($order) ) {
+		if (empty($order)) {
 			
 			$order = false;
 		
@@ -1092,7 +1092,7 @@ 
 	*  @return	$field - the modified field
 	*/
 
-	function update_field( $field ) {
+	function update_field($field) {
 		
 		// vars
 		$layouts = acf_extract_var($field, 'layouts');
@@ -1103,9 +1103,9 @@ 
 		
 		
 		// loop through sub fields
-		if( !empty($layouts) ) {
+		if ( ! empty($layouts)) {
 			
-			foreach( $layouts as $layout ) {
+			foreach ($layouts as $layout) {
 				
 				// remove sub fields
 				unset($layout['sub_fields']);
@@ -1137,19 +1137,19 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_field( $field ) {
+	function delete_field($field) {
 		
-		if( !empty($field['layouts']) ) {
+		if ( ! empty($field['layouts'])) {
 			
 			// loop through layouts
-			foreach( $field['layouts'] as $layout ) {
+			foreach ($field['layouts'] as $layout) {
 				
 				// loop through sub fields
-				if( !empty($layout['sub_fields']) ) {
+				if ( ! empty($layout['sub_fields'])) {
 				
-					foreach( $layout['sub_fields'] as $sub_field ) {
+					foreach ($layout['sub_fields'] as $sub_field) {
 					
-						acf_delete_field( $sub_field['ID'] );
+						acf_delete_field($sub_field['ID']);
 						
 					}
 					// foreach
@@ -1180,23 +1180,23 @@ 
 	*  @return	$field - the modified field
 	*/
 	
-	function duplicate_field( $field ) {
+	function duplicate_field($field) {
 		
 		// vars
 		$sub_fields = array();
 		
 		
-		if( !empty($field['layouts']) ) {
+		if ( ! empty($field['layouts'])) {
 			
 			// loop through layouts
-			foreach( $field['layouts'] as $layout ) {
+			foreach ($field['layouts'] as $layout) {
 				
 				// extract sub fields
-				$extra = acf_extract_var( $layout, 'sub_fields' );
+				$extra = acf_extract_var($layout, 'sub_fields');
 				
 				
 				// merge
-				if( !empty($extra) ) {
+				if ( ! empty($extra)) {
 					
 					$sub_fields = array_merge($sub_fields, $extra);
 					
@@ -1210,11 +1210,11 @@ 
 		
 		
 		// save field to get ID
-		$field = acf_update_field( $field );
+		$field = acf_update_field($field);
 		
 		
 		// duplicate sub fields
-		acf_duplicate_fields( $sub_fields, $field['ID'] );
+		acf_duplicate_fields($sub_fields, $field['ID']);
 		
 		
 		// return		

Braces +10 added lines, -4 removed lines

@@ -403,8 +403,11 @@ 
 		</thead>
 		
 		<tbody>
-	<?php else: ?>
-	<div class="acf-fields <?php if($layout['display'] == 'row'): ?>-left<?php endif; ?>">
+	<?php else {
+	: ?>
+	<div class="acf-fields <?php if($layout['display'] == 'row'): ?>-left<?php endif;
+}
+?>">
 	<?php endif; ?>
 	
 		<?php
@@ -448,9 +451,12 @@ 
 	<?php if( $layout['display'] == 'table' ): ?>
 		</tbody>
 	</table>
-	<?php else: ?>
+	<?php else {
+	: ?>
 	</div>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 
 <?php endif; ?>
 

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
 	}
 		
 	

includes/acf/pro/fields/gallery.php

Spacing +103 added lines, -103 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_gallery') ) :
+if ( ! class_exists('acf_field_gallery')) :
 
 class acf_field_gallery extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'gallery';
-		$this->label = __("Gallery",'acf');
+		$this->label = __("Gallery", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'preview_size'	=> 'thumbnail',
@@ -49,23 +49,23 @@ 
 			'mime_types'	=> ''
 		);
 		$this->l10n = array(
-			'select'		=> __("Add Image to Gallery",'acf'),
-			'edit'			=> __("Edit Image",'acf'),
-			'update'		=> __("Update Image",'acf'),
-			'uploadedTo'	=> __("uploaded to this post",'acf'),
-			'max'			=> __("Maximum selection reached",'acf')
+			'select'		=> __("Add Image to Gallery", 'acf'),
+			'edit'			=> __("Edit Image", 'acf'),
+			'update'		=> __("Update Image", 'acf'),
+			'uploadedTo'	=> __("uploaded to this post", 'acf'),
+			'max'			=> __("Maximum selection reached", 'acf')
 		);
 		
 		
 		// actions
-		add_action('wp_ajax_acf/fields/gallery/get_attachment',				array($this, 'ajax_get_attachment'));
-		add_action('wp_ajax_nopriv_acf/fields/gallery/get_attachment',		array($this, 'ajax_get_attachment'));
+		add_action('wp_ajax_acf/fields/gallery/get_attachment', array($this, 'ajax_get_attachment'));
+		add_action('wp_ajax_nopriv_acf/fields/gallery/get_attachment', array($this, 'ajax_get_attachment'));
 		
-		add_action('wp_ajax_acf/fields/gallery/update_attachment',			array($this, 'ajax_update_attachment'));
-		add_action('wp_ajax_nopriv_acf/fields/gallery/update_attachment',	array($this, 'ajax_update_attachment'));
+		add_action('wp_ajax_acf/fields/gallery/update_attachment', array($this, 'ajax_update_attachment'));
+		add_action('wp_ajax_nopriv_acf/fields/gallery/update_attachment', array($this, 'ajax_update_attachment'));
 		
-		add_action('wp_ajax_acf/fields/gallery/get_sort_order',				array($this, 'ajax_get_sort_order'));
-		add_action('wp_ajax_nopriv_acf/fields/gallery/get_sort_order',		array($this, 'ajax_get_sort_order'));
+		add_action('wp_ajax_acf/fields/gallery/get_sort_order', array($this, 'ajax_get_sort_order'));
+		add_action('wp_ajax_nopriv_acf/fields/gallery/get_sort_order', array($this, 'ajax_get_sort_order'));
 		
 		
 		
@@ -90,7 +90,7 @@ 
 	function ajax_get_attachment() {
 	
 		// options
-   		$options = acf_parse_args( $_POST, array(
+   		$options = acf_parse_args($_POST, array(
 			'post_id'		=>	0,
 			'id'			=>	0,
 			'field_key'		=>	'',
@@ -99,13 +99,13 @@ 
    		
 		
 		// validate
-		if( ! wp_verify_nonce($options['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($options['nonce'], 'acf_nonce')) {
 			
 			die();
 			
 		}
 		
-		if( empty($options['id']) ) {
+		if (empty($options['id'])) {
 		
 			die();
 			
@@ -113,9 +113,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			die();
 			
@@ -123,7 +123,7 @@ 
 		
 		
 		// render
-		$this->render_attachment( $options['id'], $field );
+		$this->render_attachment($options['id'], $field);
 		die;
 		
 	}
@@ -145,7 +145,7 @@ 
 	function ajax_update_attachment() {
 		
 		// validate nonce
-		if( !wp_verify_nonce($_POST['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($_POST['nonce'], 'acf_nonce')) {
 		
 			wp_send_json_error();
 			
@@ -153,7 +153,7 @@ 
 		
 		
 		// bail early if no attachments
-		if( empty($_POST['attachments']) ) {
+		if (empty($_POST['attachments'])) {
 		
 			wp_send_json_error();
 			
@@ -161,47 +161,47 @@ 
 		
 		
 		// loop over attachments
-		foreach( $_POST['attachments'] as $id => $changes ) {
+		foreach ($_POST['attachments'] as $id => $changes) {
 			
-			if ( !current_user_can( 'edit_post', $id ) )
+			if ( ! current_user_can('edit_post', $id))
 				wp_send_json_error();
 				
-			$post = get_post( $id, ARRAY_A );
+			$post = get_post($id, ARRAY_A);
 		
-			if ( 'attachment' != $post['post_type'] )
+			if ('attachment' != $post['post_type'])
 				wp_send_json_error();
 		
-			if ( isset( $changes['title'] ) )
+			if (isset($changes['title']))
 				$post['post_title'] = $changes['title'];
 		
-			if ( isset( $changes['caption'] ) )
+			if (isset($changes['caption']))
 				$post['post_excerpt'] = $changes['caption'];
 		
-			if ( isset( $changes['description'] ) )
+			if (isset($changes['description']))
 				$post['post_content'] = $changes['description'];
 		
-			if ( isset( $changes['alt'] ) ) {
-				$alt = wp_unslash( $changes['alt'] );
-				if ( $alt != get_post_meta( $id, '_wp_attachment_image_alt', true ) ) {
-					$alt = wp_strip_all_tags( $alt, true );
-					update_post_meta( $id, '_wp_attachment_image_alt', wp_slash( $alt ) );
+			if (isset($changes['alt'])) {
+				$alt = wp_unslash($changes['alt']);
+				if ($alt != get_post_meta($id, '_wp_attachment_image_alt', true)) {
+					$alt = wp_strip_all_tags($alt, true);
+					update_post_meta($id, '_wp_attachment_image_alt', wp_slash($alt));
 				}
 			}
 			
 			
 			// save post
-			wp_update_post( $post );
+			wp_update_post($post);
 			
 			
 			/** This filter is documented in wp-admin/includes/media.php */
 			// - seems off to run this filter AFTER the update_post function, but there is a reason
 			// - when placed BEFORE, an empty post_title will be populated by WP
 			// - this filter will still allow 3rd party to save extra image data!
-			$post = apply_filters( 'attachment_fields_to_save', $post, $changes );
+			$post = apply_filters('attachment_fields_to_save', $post, $changes);
 			
 			
 			// save meta
-			acf_save_post( $id );
+			acf_save_post($id);
 						
 		}
 		
@@ -230,7 +230,7 @@ 
 		// vars
 		$r = array();
 		$order = 'DESC';
-   		$args = acf_parse_args( $_POST, array(
+   		$args = acf_parse_args($_POST, array(
 			'ids'			=>	0,
 			'sort'			=>	'date',
 			'field_key'		=>	'',
@@ -239,7 +239,7 @@ 
 		
 		
 		// validate
-		if( ! wp_verify_nonce($args['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($args['nonce'], 'acf_nonce')) {
 		
 			wp_send_json_error();
 			
@@ -247,7 +247,7 @@ 
 		
 		
 		// reverse
-		if( $args['sort'] == 'reverse' ) {
+		if ($args['sort'] == 'reverse') {
 		
 			$ids = array_reverse($args['ids']);
 			
@@ -256,7 +256,7 @@ 
 		}
 		
 		
-		if( $args['sort'] == 'title' ) {
+		if ($args['sort'] == 'title') {
 			
 			$order = 'ASC';
 			
@@ -276,7 +276,7 @@ 
 		
 		
 		// success
-		if( !empty($ids) ) {
+		if ( ! empty($ids)) {
 		
 			wp_send_json_success($ids);
 			
@@ -302,28 +302,28 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function render_attachment( $id = 0, $field ) {
+	function render_attachment($id = 0, $field) {
 		
 		// vars
-		$attachment = wp_prepare_attachment_for_js( $id );
+		$attachment = wp_prepare_attachment_for_js($id);
 		$thumb = '';
 		$prefix = "attachments[{$id}]";
-		$compat = get_compat_media_markup( $id );
+		$compat = get_compat_media_markup($id);
 		$dimentions = '';
 		
 		
 		// thumb
-		if( isset($attachment['thumb']['src']) ) {
+		if (isset($attachment['thumb']['src'])) {
 			
 			// video
 			$thumb = $attachment['thumb']['src'];
 			
-		} elseif( isset($attachment['sizes']['thumbnail']['url']) ) {
+		} elseif (isset($attachment['sizes']['thumbnail']['url'])) {
 			
 			// image
 			$thumb = $attachment['sizes']['thumbnail']['url'];
 			
-		} elseif( $attachment['type'] === 'image' ) {
+		} elseif ($attachment['type'] === 'image') {
 			
 			// svg
 			$thumb = $attachment['url'];
@@ -338,19 +338,19 @@ 
 		
 		
 		// dimentions
-		if( $attachment['type'] === 'audio' ) {
+		if ($attachment['type'] === 'audio') {
 			
-			$dimentions = __('Length', 'acf') . ': ' . $attachment['fileLength'];
+			$dimentions = __('Length', 'acf').': '.$attachment['fileLength'];
 			
-		} elseif( !empty($attachment['width']) ) {
+		} elseif ( ! empty($attachment['width'])) {
 			
-			$dimentions = $attachment['width'] . ' x ' . $attachment['height'];
+			$dimentions = $attachment['width'].' x '.$attachment['height'];
 			
 		}
 		
-		if( $attachment['filesizeHumanReadable'] ) {
+		if ($attachment['filesizeHumanReadable']) {
 			
-			$dimentions .=  ' (' . $attachment['filesizeHumanReadable'] . ')';
+			$dimentions .= ' ('.$attachment['filesizeHumanReadable'].')';
 			
 		}
 		
@@ -424,7 +424,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// enqueue
 		acf_enqueue_uploader();
@@ -445,12 +445,12 @@ 
 		
 		// set gallery height
 		$height = acf_get_user_setting('gallery_height', 400);
-		$height = max( $height, 200 ); // minimum height is 200
+		$height = max($height, 200); // minimum height is 200
 		$atts['style'] = "height:{$height}px";
 		
 		
 		// load posts
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			$posts = acf_get_posts(array(
 				'post_type'	=> 'attachment',
@@ -464,16 +464,16 @@ 
 <div <?php acf_esc_attr_e($atts); ?>>
 	
 	<div class="acf-hidden">
-		<input type="hidden" <?php acf_esc_attr_e(array( 'name' => $field['name'], 'value' => '', 'data-name' => 'ids' )); ?> />
+		<input type="hidden" <?php acf_esc_attr_e(array('name' => $field['name'], 'value' => '', 'data-name' => 'ids')); ?> />
 	</div>
 	
 	<div class="acf-gallery-main">
 		
 		<div class="acf-gallery-attachments">
 			
-			<?php if( !empty($posts) ): ?>
+			<?php if ( ! empty($posts)): ?>
 			
-				<?php foreach( $posts as $post ): 
+				<?php foreach ($posts as $post): 
 					
 					// vars
 					$type = acf_maybe_get(explode('/', $post->post_mime_type), 0);
@@ -484,21 +484,21 @@ 
 					
 					
 					// thumb
-					if( $type === 'image' || $type === 'audio' || $type === 'video' ) {
+					if ($type === 'image' || $type === 'audio' || $type === 'video') {
 						
 						// change $thumb_id
-						if( $type === 'audio' || $type === 'video' ) {
+						if ($type === 'audio' || $type === 'video') {
 							
-							$thumb_id = get_post_thumbnail_id( $post->ID );
+							$thumb_id = get_post_thumbnail_id($post->ID);
 							
 						}
 						
 						
 						// get attachment
-						if( $thumb_id ) {
+						if ($thumb_id) {
 							
-							$thumb_url = wp_get_attachment_image_src( $thumb_id, $field['preview_size'] );
-							$thumb_url = acf_maybe_get( $thumb_url, 0 );
+							$thumb_url = wp_get_attachment_image_src($thumb_id, $field['preview_size']);
+							$thumb_url = acf_maybe_get($thumb_url, 0);
 						
 						}
 						
@@ -506,9 +506,9 @@ 
 					
 					
 					// fallback
-					if( !$thumb_url ) {
+					if ( ! $thumb_url) {
 						
-						$thumb_url = wp_mime_type_icon( $post->ID );
+						$thumb_url = wp_mime_type_icon($post->ID);
 						$thumb_class .= ' is-mime-icon';
 						
 					}
@@ -520,7 +520,7 @@ 
 							<div class="thumbnail">
 								<img src="<?php echo $thumb_url; ?>"/>
 							</div>
-							<?php if( $type !== 'image' ): ?>
+							<?php if ($type !== 'image'): ?>
 							<div class="filename"><?php echo acf_get_truncated($filename, 18); ?></div>
 							<?php endif; ?>
 						</div>
@@ -597,7 +597,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// clear numeric settings
 		$clear = array(
@@ -611,9 +611,9 @@ 
 			'max_size'
 		);
 		
-		foreach( $clear as $k ) {
+		foreach ($clear as $k) {
 			
-			if( empty($field[$k]) ) {
+			if (empty($field[$k])) {
 				
 				$field[$k] = '';
 				
@@ -623,8 +623,8 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum Selection','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum Selection', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'min'
@@ -632,8 +632,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum Selection','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum Selection', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'max'
@@ -641,9 +641,9 @@ 
 		
 		
 		// preview_size
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Preview Size','acf'),
-			'instructions'	=> __('Shown when entering data','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Preview Size', 'acf'),
+			'instructions'	=> __('Shown when entering data', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'preview_size',
 			'choices'		=> acf_get_image_sizes()
@@ -651,9 +651,9 @@ 
 		
 		
 		// library
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Library','acf'),
-			'instructions'	=> __('Limit the media library choice','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Library', 'acf'),
+			'instructions'	=> __('Limit the media library choice', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'library',
 			'layout'		=> 'horizontal',
@@ -665,16 +665,16 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum','acf'),
-			'instructions'	=> __('Restrict which images can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum', 'acf'),
+			'instructions'	=> __('Restrict which images can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'min_width',
 			'prepend'		=> __('Width', 'acf'),
 			'append'		=> 'px',
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'min_height',
@@ -685,7 +685,7 @@ 
 			)
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'min_size',
@@ -698,16 +698,16 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum','acf'),
-			'instructions'	=> __('Restrict which images can be uploaded','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum', 'acf'),
+			'instructions'	=> __('Restrict which images can be uploaded', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'max_width',
 			'prepend'		=> __('Width', 'acf'),
 			'append'		=> 'px',
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'max_height',
@@ -718,7 +718,7 @@ 
 			)
 		));
 		
-		acf_render_field_setting( $field, array(
+		acf_render_field_setting($field, array(
 			'label'			=> '',
 			'type'			=> 'text',
 			'name'			=> 'max_size',
@@ -731,9 +731,9 @@ 
 		
 		
 		// allowed type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allowed file types','acf'),
-			'instructions'	=> __('Comma separated list. Leave blank for all types','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allowed file types', 'acf'),
+			'instructions'	=> __('Comma separated list. Leave blank for all types', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'mime_types',
 		));
@@ -757,10 +757,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) ) {
+		if (empty($value)) {
 			
 			// return false as $value may be '' (from DB) which doesn't make much sense
 			return false;
@@ -777,9 +777,9 @@ 
 		
 		
 		// update value to include $post
-		foreach( array_keys($posts) as $i ) {
+		foreach (array_keys($posts) as $i) {
 			
-			$posts[ $i ] = acf_get_attachment( $posts[ $i ] );
+			$posts[$i] = acf_get_attachment($posts[$i]);
 			
 		}
 				
@@ -803,19 +803,19 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
-		if( empty($value) || !is_array($value) ) {
+		if (empty($value) || ! is_array($value)) {
 		
 			$value = array();
 			
 		}
 		
 		
-		if( count($value) < $field['min'] ) {
+		if (count($value) < $field['min']) {
 		
-			$valid = _n( '%s requires at least %s selection', '%s requires at least %s selections', $field['min'], 'acf' );
-			$valid = sprintf( $valid, $field['label'], $field['min'] );
+			$valid = _n('%s requires at least %s selection', '%s requires at least %s selections', $field['min'], 'acf');
+			$valid = sprintf($valid, $field['label'], $field['min']);
 			
 		}
 		

Braces +15 added lines, -10 removed lines

@@ -163,22 +163,27 @@
 		// loop over attachments
 		foreach( $_POST['attachments'] as $id => $changes ) {
 			
-			if ( !current_user_can( 'edit_post', $id ) )
-				wp_send_json_error();
+			if ( !current_user_can( 'edit_post', $id ) ) {
+							wp_send_json_error();
+			}
 				
 			$post = get_post( $id, ARRAY_A );
 		
-			if ( 'attachment' != $post['post_type'] )
-				wp_send_json_error();
+			if ( 'attachment' != $post['post_type'] ) {
+							wp_send_json_error();
+			}
 		
-			if ( isset( $changes['title'] ) )
-				$post['post_title'] = $changes['title'];
+			if ( isset( $changes['title'] ) ) {
+							$post['post_title'] = $changes['title'];
+			}
 		
-			if ( isset( $changes['caption'] ) )
-				$post['post_excerpt'] = $changes['caption'];
+			if ( isset( $changes['caption'] ) ) {
+							$post['post_excerpt'] = $changes['caption'];
+			}
 		
-			if ( isset( $changes['description'] ) )
-				$post['post_content'] = $changes['description'];
+			if ( isset( $changes['description'] ) ) {
+							$post['post_content'] = $changes['description'];
+			}
 		
 			if ( isset( $changes['alt'] ) ) {
 				$alt = wp_unslash( $changes['alt'] );

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
 	}
 		
 	

includes/acf/pro/fields/repeater.php

Spacing +129 added lines, -129 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_repeater') ) :
+if ( ! class_exists('acf_field_repeater')) :
 
 class acf_field_repeater extends acf_field {
 	
@@ -33,19 +33,19 @@ 
 		
 		// vars
 		$this->name = 'repeater';
-		$this->label = __("Repeater",'acf');
+		$this->label = __("Repeater", 'acf');
 		$this->category = 'layout';
 		$this->defaults = array(
 			'sub_fields'	=> array(),
 			'min'			=> 0,
 			'max'			=> 0,
 			'layout' 		=> 'table',
-			'button_label'	=> __("Add Row",'acf'),
+			'button_label'	=> __("Add Row", 'acf'),
 			'collapsed'		=> ''
 		);
 		$this->l10n = array(
-			'min'			=>	__("Minimum rows reached ({min} rows)",'acf'),
-			'max'			=>	__("Maximum rows reached ({max} rows)",'acf'),
+			'min'			=>	__("Minimum rows reached ({min} rows)", 'acf'),
+			'max'			=>	__("Maximum rows reached ({max} rows)", 'acf'),
 		);
 		
 		
@@ -68,9 +68,9 @@ 
 	*  @return	$field - the field array holding all the field options
 	*/
 	
-	function load_field( $field ) {
+	function load_field($field) {
 		
-		$field['sub_fields'] = acf_get_fields( $field );
+		$field['sub_fields'] = acf_get_fields($field);
 		
 		
 		// return
@@ -91,7 +91,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$div = array(
@@ -102,7 +102,7 @@ 
 		
 		
 		// ensure value is an array
-		if( empty($field['value']) ) {
+		if (empty($field['value'])) {
 		
 			$field['value'] = array();
 			
@@ -121,12 +121,12 @@ 
 		
 		
 		// If there are less values than min, populate the extra values
-		if( $field['min'] ) {
+		if ($field['min']) {
 			
-			for( $i = 0; $i < $field['min']; $i++ ) {
+			for ($i = 0; $i < $field['min']; $i++) {
 			
 				// continue if already have a value
-				if( array_key_exists($i, $field['value']) ) {
+				if (array_key_exists($i, $field['value'])) {
 				
 					continue;
 					
@@ -134,7 +134,7 @@ 
 				
 				
 				// populate values
-				$field['value'][ $i ] = $empty_row;
+				$field['value'][$i] = $empty_row;
 				
 			}
 			
@@ -142,13 +142,13 @@ 
 		
 		
 		// If there are more values than man, remove some values
-		if( $field['max'] ) {
+		if ($field['max']) {
 		
-			for( $i = 0; $i < count($field['value']); $i++ ) {
+			for ($i = 0; $i < count($field['value']); $i++) {
 			
-				if( $i >= $field['max'] ) {
+				if ($i >= $field['max']) {
 				
-					unset( $field['value'][ $i ] );
+					unset($field['value'][$i]);
 					
 				}
 				
@@ -167,15 +167,15 @@ 
 		$show_remove = true;
 		
 		
-		if( $field['max'] ) {
+		if ($field['max']) {
 		
-			if( $field['max'] == 1 ) {
+			if ($field['max'] == 1) {
 			
 				$show_order = false;
 				
 			}
 			
-			if( $field['max'] <= $field['min'] ) {
+			if ($field['max'] <= $field['min']) {
 			
 				$show_remove = false;
 				$show_add = false;
@@ -190,13 +190,13 @@ 
 		$before_fields = '';
 		$after_fields = '';
 		
-		if( $field['layout'] == 'row' ) {
+		if ($field['layout'] == 'row') {
 		
 			$el = 'div';
 			$before_fields = '<td class="acf-fields -left">';
 			$after_fields = '</td>';
 			
-		} elseif( $field['layout'] == 'block' ) {
+		} elseif ($field['layout'] == 'block') {
 		
 			$el = 'div';
 			
@@ -207,7 +207,7 @@ 
 		
 		
 		// layout
-		$div['class'] .= ' -' . $field['layout'];
+		$div['class'] .= ' -'.$field['layout'];
 		
 		
 		// hidden input
@@ -220,20 +220,20 @@ 
 		// collapsed
 		$collapsed = array();
 		
-		if( $field['collapsed'] ) {
+		if ($field['collapsed']) {
 			
 			// get user setting
-			$collapsed = acf_get_user_setting('collapsed_' . $field['key'], '');
+			$collapsed = acf_get_user_setting('collapsed_'.$field['key'], '');
 			$collapsed = explode(',', $collapsed);
 			$collapsed = array_filter($collapsed, 'is_numeric');
 			
 			
 			// add target class
-			foreach( array_keys($field['sub_fields']) as $i ) {
+			foreach (array_keys($field['sub_fields']) as $i) {
 				
-				if( $field['sub_fields'][ $i ]['key'] === $field['collapsed'] ) {
+				if ($field['sub_fields'][$i]['key'] === $field['collapsed']) {
 					
-					$field['sub_fields'][ $i ]['wrapper']['class'] .= ' -collapsed-target';
+					$field['sub_fields'][$i]['wrapper']['class'] .= ' -collapsed-target';
 					
 				}
 								
@@ -245,14 +245,14 @@ 
 <div <?php acf_esc_attr_e($div); ?>>
 <table class="acf-table">
 	
-	<?php if( $field['layout'] == 'table' ): ?>
+	<?php if ($field['layout'] == 'table'): ?>
 		<thead>
 			<tr>
-				<?php if( $show_order ): ?>
+				<?php if ($show_order): ?>
 					<th class="acf-row-handle"><span></span></th>
 				<?php endif; ?>
 				
-				<?php foreach( $field['sub_fields'] as $sub_field ): 
+				<?php foreach ($field['sub_fields'] as $sub_field): 
 					
 					$atts = array(
 						'class'		=> 'acf-th',
@@ -261,27 +261,27 @@ 
 					
 					
 					// add type
-					$atts['class'] .= ' acf-th-' . $sub_field['type'];
+					$atts['class'] .= ' acf-th-'.$sub_field['type'];
 					
 					
 					// Add custom width
-					if( $sub_field['wrapper']['width'] ) {
+					if ($sub_field['wrapper']['width']) {
 					
 						$atts['data-width'] = $sub_field['wrapper']['width'];
 						
 					}
 						
 					?>
-					<th <?php acf_esc_attr_e( $atts ); ?>>
-						<?php echo acf_get_field_label( $sub_field ); ?>
-						<?php if( $sub_field['instructions'] ): ?>
+					<th <?php acf_esc_attr_e($atts); ?>>
+						<?php echo acf_get_field_label($sub_field); ?>
+						<?php if ($sub_field['instructions']): ?>
 							<p class="description"><?php echo $sub_field['instructions']; ?></p>
 						<?php endif; ?>
 					</th>
 					
 				<?php endforeach; ?>
 
-				<?php if( $show_remove ): ?>
+				<?php if ($show_remove): ?>
 					<th class="acf-row-handle"><span></span></th>
 				<?php endif; ?>
 			</tr>
@@ -289,15 +289,15 @@ 
 	<?php endif; ?>
 	
 	<tbody>
-		<?php foreach( $field['value'] as $i => $row ): 
+		<?php foreach ($field['value'] as $i => $row): 
 			
 			$row_class = 'acf-row';
 			
-			if( $i === 'acfcloneindex' ) {
+			if ($i === 'acfcloneindex') {
 				
 				$row_class .= ' acf-clone';
 				
-			} elseif( in_array($i, $collapsed) ) {
+			} elseif (in_array($i, $collapsed)) {
 				
 				$row_class .= ' -collapsed';
 				
@@ -306,10 +306,10 @@ 
 			?>
 			<tr class="<?php echo $row_class; ?>" data-id="<?php echo $i; ?>">
 				
-				<?php if( $show_order ): ?>
-					<td class="acf-row-handle order" title="<?php _e('Drag to reorder','acf'); ?>">
-						<?php if( $field['collapsed'] ): ?>
-						<a class="acf-icon -collapse small" href="#" data-event="collapse-row" title="<?php _e('Click to toggle','acf'); ?>"></a>
+				<?php if ($show_order): ?>
+					<td class="acf-row-handle order" title="<?php _e('Drag to reorder', 'acf'); ?>">
+						<?php if ($field['collapsed']): ?>
+						<a class="acf-icon -collapse small" href="#" data-event="collapse-row" title="<?php _e('Click to toggle', 'acf'); ?>"></a>
 						<?php endif; ?>
 						<span><?php echo intval($i) + 1; ?></span>
 					</td>
@@ -317,10 +317,10 @@ 
 				
 				<?php echo $before_fields; ?>
 				
-				<?php foreach( $field['sub_fields'] as $sub_field ): 
+				<?php foreach ($field['sub_fields'] as $sub_field): 
 					
 					// prevent repeater field from creating multiple conditional logic items for each row
-					if( $i !== 'acfcloneindex' ) {
+					if ($i !== 'acfcloneindex') {
 					
 						$sub_field['conditional_logic'] = 0;
 						
@@ -328,12 +328,12 @@ 
 					
 					
 					// add value
-					if( isset($row[ $sub_field['key'] ]) ) {
+					if (isset($row[$sub_field['key']])) {
 						
 						// this is a normal value
-						$sub_field['value'] = $row[ $sub_field['key'] ];
+						$sub_field['value'] = $row[$sub_field['key']];
 						
-					} elseif( isset($sub_field['default_value']) ) {
+					} elseif (isset($sub_field['default_value'])) {
 						
 						// no value, but this sub field has a default value
 						$sub_field['value'] = $sub_field['default_value'];
@@ -346,16 +346,16 @@ 
 					
 					
 					// render input
-					acf_render_field_wrap( $sub_field, $el ); ?>
+					acf_render_field_wrap($sub_field, $el); ?>
 					
 				<?php endforeach; ?>
 				
 				<?php echo $after_fields; ?>
 				
-				<?php if( $show_remove ): ?>
+				<?php if ($show_remove): ?>
 					<td class="acf-row-handle remove">
-						<a class="acf-icon -plus small" href="#" data-event="add-row" title="<?php _e('Add row','acf'); ?>"></a>
-						<a class="acf-icon -minus small" href="#" data-event="remove-row" title="<?php _e('Remove row','acf'); ?>"></a>
+						<a class="acf-icon -plus small" href="#" data-event="add-row" title="<?php _e('Add row', 'acf'); ?>"></a>
+						<a class="acf-icon -minus small" href="#" data-event="remove-row" title="<?php _e('Remove row', 'acf'); ?>"></a>
 					</td>
 				<?php endif; ?>
 				
@@ -363,7 +363,7 @@ 
 		<?php endforeach; ?>
 	</tbody>
 </table>
-<?php if( $show_add ): ?>
+<?php if ($show_add): ?>
 	
 	<ul class="acf-hl">
 		<li class="acf-fr">
@@ -391,7 +391,7 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// vars
 		$args = array(
@@ -403,7 +403,7 @@ 
 		
 		?><tr class="acf-field" data-setting="repeater" data-name="sub_fields">
 			<td class="acf-label">
-				<label><?php _e("Sub Fields",'acf'); ?></label>
+				<label><?php _e("Sub Fields", 'acf'); ?></label>
 				<p class="description"></p>		
 			</td>
 			<td class="acf-input">
@@ -425,16 +425,16 @@ 
 		// preview
 		$choices = array();
 		
-		if( $field['collapsed'] ) {
+		if ($field['collapsed']) {
 			
-			$choices[ $field['collapsed'] ] = $field['collapsed'];
+			$choices[$field['collapsed']] = $field['collapsed'];
 			
 		}
 		
 		
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Collapsed','acf'),
-			'instructions'	=> __('Select a sub field to show when row is collapsed','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Collapsed', 'acf'),
+			'instructions'	=> __('Select a sub field to show when row is collapsed', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'collapsed',
 			'allow_null'	=> 1,
@@ -443,8 +443,8 @@ 
 		
 		
 		// min
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Minimum Rows','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Minimum Rows', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'min',
@@ -453,8 +453,8 @@ 
 		
 		
 		// max
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Maximum Rows','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Maximum Rows', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'number',
 			'name'			=> 'max',
@@ -463,24 +463,24 @@ 
 		
 		
 		// layout
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Layout','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Layout', 'acf'),
 			'instructions'	=> '',
 			'class'			=> 'acf-repeater-layout',
 			'type'			=> 'radio',
 			'name'			=> 'layout',
 			'layout'		=> 'horizontal',
 			'choices'		=> array(
-				'table'			=> __('Table','acf'),
-				'block'			=> __('Block','acf'),
-				'row'			=> __('Row','acf')
+				'table'			=> __('Table', 'acf'),
+				'block'			=> __('Block', 'acf'),
+				'row'			=> __('Row', 'acf')
 			)
 		));
 		
 		
 		// button_label
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Button Label','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Button Label', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'text',
 			'name'			=> 'button_label',
@@ -504,10 +504,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) || empty($field['sub_fields']) ) {
+		if (empty($value) || empty($field['sub_fields'])) {
 			
 			return $value;
 			
@@ -515,7 +515,7 @@ 
 		
 		
 		// convert to int
-		$value = intval( $value );
+		$value = intval($value);
 		
 		
 		// vars
@@ -523,20 +523,20 @@ 
 		
 		
 		// check number of rows
-		if( $value > 0 ) {
+		if ($value > 0) {
 			
 			// loop through rows
-			for( $i = 0; $i < $value; $i++ ) {
+			for ($i = 0; $i < $value; $i++) {
 				
 				// create empty array
-				$rows[ $i ] = array();
+				$rows[$i] = array();
 				
 				
 				// loop through sub fields
-				foreach( array_keys($field['sub_fields']) as $j ) {
+				foreach (array_keys($field['sub_fields']) as $j) {
 					
 					// get sub field
-					$sub_field = $field['sub_fields'][ $j ];
+					$sub_field = $field['sub_fields'][$j];
 					
 					
 					// update $sub_field name
@@ -544,11 +544,11 @@ 
 					
 					
 					// get value
-					$sub_value = acf_get_value( $post_id, $sub_field );
+					$sub_value = acf_get_value($post_id, $sub_field);
 				
 				
 					// add value
-					$rows[ $i ][ $sub_field['key'] ] = $sub_value;
+					$rows[$i][$sub_field['key']] = $sub_value;
 					
 				}
 				// foreach
@@ -582,10 +582,10 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		// bail early if no value
-		if( empty($value) || empty($field['sub_fields']) ) {
+		if (empty($value) || empty($field['sub_fields'])) {
 						
 			return false;
 			
@@ -593,25 +593,25 @@ 
 		
 		
 		// loop over rows
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
 			// loop through sub fields
-			foreach( array_keys($field['sub_fields']) as $j ) {
+			foreach (array_keys($field['sub_fields']) as $j) {
 				
 				// get sub field
-				$sub_field = $field['sub_fields'][ $j ];
+				$sub_field = $field['sub_fields'][$j];
 				
 				
 				// extract value
-				$sub_value = acf_extract_var( $value[ $i ], $sub_field['key'] );
+				$sub_value = acf_extract_var($value[$i], $sub_field['key']);
 				
 				
 				// format value
-				$sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
+				$sub_value = acf_format_value($sub_value, $post_id, $sub_field);
 				
 				
 				// append to $row
-				$value[ $i ][ $sub_field['name'] ] = $sub_value;
+				$value[$i][$sub_field['name']] = $sub_value;
 				
 			}
 			
@@ -637,10 +637,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// remove acfcloneindex
-		if( isset($value['acfcloneindex']) ) {
+		if (isset($value['acfcloneindex'])) {
 		
 			unset($value['acfcloneindex']);
 			
@@ -648,7 +648,7 @@ 
 		
 		
 		// valid
-		if( $field['required'] && empty($value) ) {
+		if ($field['required'] && empty($value)) {
 		
 			$valid = false;
 			
@@ -656,20 +656,20 @@ 
 		
 		
 		// check sub fields
-		if( !empty($field['sub_fields']) && !empty($value) ) {
+		if ( ! empty($field['sub_fields']) && ! empty($value)) {
 			
 			$keys = array_keys($value);
 			
-			foreach( $keys as $i ) {
+			foreach ($keys as $i) {
 				
-				foreach( $field['sub_fields'] as $sub_field ) {
+				foreach ($field['sub_fields'] as $sub_field) {
 					
 					// vars
 					$k = $sub_field['key'];
 					
 					
 					// test sub field exists
-					if( !isset($value[ $i ][ $k ]) ) {
+					if ( ! isset($value[$i][$k])) {
 					
 						continue;
 						
@@ -677,7 +677,7 @@ 
 					
 					
 					// validate
-					acf_validate_value( $value[ $i ][ $k ], $sub_field, "{$input}[{$i}][{$k}]" );
+					acf_validate_value($value[$i][$k], $sub_field, "{$input}[{$i}][{$k}]");
 				}
 				
 			}
@@ -705,14 +705,14 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// vars
 		$total = 0;
 		
 		
 		// remove acfcloneindex
-		if( isset($value['acfcloneindex']) ) {
+		if (isset($value['acfcloneindex'])) {
 		
 			unset($value['acfcloneindex']);
 			
@@ -720,14 +720,14 @@ 
 		
 		
 		// update sub fields
-		if( !empty($value) ) {
+		if ( ! empty($value)) {
 			
 			// $i
 			$i = -1;
 			
 			
 			// loop through rows
-			foreach( $value as $row ) {	
+			foreach ($value as $row) {	
 				
 				// $i
 				$i++;
@@ -738,7 +738,7 @@ 
 				
 				
 				// continue if no sub fields
-				if( !$field['sub_fields'] ) {
+				if ( ! $field['sub_fields']) {
 					
 					continue;
 					
@@ -746,20 +746,20 @@ 
 					
 					
 				// loop through sub fields
-				foreach( $field['sub_fields'] as $sub_field ) {
+				foreach ($field['sub_fields'] as $sub_field) {
 					
 					// value
 					$v = false;
 					
 					
 					// key (backend)
-					if( isset($row[ $sub_field['key'] ]) ) {
+					if (isset($row[$sub_field['key']])) {
 						
-						$v = $row[ $sub_field['key'] ];
+						$v = $row[$sub_field['key']];
 						
-					} elseif( isset($row[ $sub_field['name'] ]) ) {
+					} elseif (isset($row[$sub_field['name']])) {
 						
-						$v = $row[ $sub_field['name'] ];
+						$v = $row[$sub_field['name']];
 						
 					} else {
 						
@@ -774,7 +774,7 @@ 
 					
 					
 					// update value
-					acf_update_value( $v, $post_id, $sub_field );
+					acf_update_value($v, $post_id, $sub_field);
 					
 				}
 				// foreach
@@ -787,20 +787,20 @@ 
 		
 		
 		// get old value (db only)
-		$old_total = (int) acf_get_metadata( $post_id, $field['name'] );
+		$old_total = (int) acf_get_metadata($post_id, $field['name']);
 		
-		if( $old_total > $total ) {
+		if ($old_total > $total) {
 			
-			for( $i = $total; $i < $old_total; $i++ ) {
+			for ($i = $total; $i < $old_total; $i++) {
 				
-				foreach( $field['sub_fields'] as $sub_field ) {
+				foreach ($field['sub_fields'] as $sub_field) {
 					
 					// modify name for delete
 					$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
 					
 					
 					// delete value
-					acf_delete_value( $post_id, $sub_field );
+					acf_delete_value($post_id, $sub_field);
 				
 				}
 				// foreach
@@ -834,30 +834,30 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_value( $post_id, $key, $field ) {
+	function delete_value($post_id, $key, $field) {
 		
 		// get old value (db only)
-		$old_total = (int) acf_get_metadata( $post_id, $field['name'] );
+		$old_total = (int) acf_get_metadata($post_id, $field['name']);
 		
 		
 		// bail early if no rows or no sub fields
-		if( !$old_total || !$field['sub_fields'] ) {
+		if ( ! $old_total || ! $field['sub_fields']) {
 			
 			return;
 			
 		}
 		
 		
-		for( $i = 0; $i < $old_total; $i++ ) {
+		for ($i = 0; $i < $old_total; $i++) {
 			
-			foreach( $field['sub_fields'] as $sub_field ) {
+			foreach ($field['sub_fields'] as $sub_field) {
 				
 				// modify name for delete
 				$sub_field['name'] = "{$key}_{$i}_{$sub_field['name']}";
 				
 				
 				// delete value
-				acf_delete_value( $post_id, $sub_field );
+				acf_delete_value($post_id, $sub_field);
 			
 			}
 			// foreach
@@ -880,14 +880,14 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function delete_field( $field ) {
+	function delete_field($field) {
 		
 		// loop through sub fields
-		if( !empty($field['sub_fields']) ) {
+		if ( ! empty($field['sub_fields'])) {
 		
-			foreach( $field['sub_fields'] as $sub_field ) {
+			foreach ($field['sub_fields'] as $sub_field) {
 			
-				acf_delete_field( $sub_field['ID'] );
+				acf_delete_field($sub_field['ID']);
 				
 			}
 			
@@ -911,7 +911,7 @@ 
 	*  @return	$field - the modified field
 	*/
 
-	function update_field( $field ) {
+	function update_field($field) {
 		
 		// remove sub fields
 		unset($field['sub_fields']);
@@ -936,18 +936,18 @@ 
 	*  @return	$field - the modified field
 	*/
 
-	function duplicate_field( $field ) {
+	function duplicate_field($field) {
 		
 		// get sub fields
-		$sub_fields = acf_extract_var( $field, 'sub_fields' );
+		$sub_fields = acf_extract_var($field, 'sub_fields');
 		
 		
 		// save field to get ID
-		$field = acf_update_field( $field );
+		$field = acf_update_field($field);
 		
 		
 		// duplicate sub fields
-		acf_duplicate_fields( $sub_fields, $field['ID'] );
+		acf_duplicate_fields($sub_fields, $field['ID']);
 		
 						
 		// return		

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 		
 		
 		// do not delete!
-    	parent::__construct();
+		parent::__construct();
 	}
 		
 	

includes/menus.php

Indentation +96 added lines, -96 removed lines

@@ -5,14 +5,14 @@ 
  *

  */

 function lighthouse_menus() {

-    register_nav_menus(

-        array(

-            'header-menu-left' => __( 'Header menu left', 'nav menu location', 'lighthouse' ),

-            'header-menu-right' => __( 'Header menu right' , 'nav menu location', 'lighthouse'),

-            'footer-menu' => __( 'Footer menu' , 'nav menu location', 'lighthouse'),

-            'footer-menu-bottom' => __( 'Footer menu bottom' , 'nav menu location', 'lighthouse')

-            )

-        );

+	register_nav_menus(

+		array(

+			'header-menu-left' => __( 'Header menu left', 'nav menu location', 'lighthouse' ),

+			'header-menu-right' => __( 'Header menu right' , 'nav menu location', 'lighthouse'),

+			'footer-menu' => __( 'Footer menu' , 'nav menu location', 'lighthouse'),

+			'footer-menu-bottom' => __( 'Footer menu bottom' , 'nav menu location', 'lighthouse')

+			)

+		);

 }

 

 add_action( 'init', 'lighthouse_menus' );

@@ -25,104 +25,104 @@ 
 

 //Left menu

 function lighthouse_header_menu_left() {

-    if ( has_nav_menu( 'header-menu-left' ) ) {

-    wp_nav_menu(

-        array(

-            'theme_location'  => 'header-menu-left',

-            'menu'            => '',

-            'container'       => 'div',

-            'container_id'    => 'header-menu-left-id',

-            'container_class' => 'header-menu-left-cl',

-            'menu_id'         => 'header-menu-id',

-            'menu_class'      => 'header-menu-cl',

-            'echo'            => true,

-            'fallback_cb'     => '',

-            'before'          => '',

-            'after'           => '',

-            'link_before'     => '<span>',

-            'link_after'      => '</span>',

-            'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

-            'depth'           => 0,

-            'walker'          => ''

-        )

-    );

-    }

+	if ( has_nav_menu( 'header-menu-left' ) ) {

+	wp_nav_menu(

+		array(

+			'theme_location'  => 'header-menu-left',

+			'menu'            => '',

+			'container'       => 'div',

+			'container_id'    => 'header-menu-left-id',

+			'container_class' => 'header-menu-left-cl',

+			'menu_id'         => 'header-menu-id',

+			'menu_class'      => 'header-menu-cl',

+			'echo'            => true,

+			'fallback_cb'     => '',

+			'before'          => '',

+			'after'           => '',

+			'link_before'     => '<span>',

+			'link_after'      => '</span>',

+			'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

+			'depth'           => 0,

+			'walker'          => ''

+		)

+	);

+	}

 }

 

 //Right menu

 function lighthouse_header_menu_right() {

-    if ( has_nav_menu( 'header-menu-right' ) ) {

-    wp_nav_menu(

-        array(

-            'theme_location'  => 'header-menu-right',

-            'menu'            => '',

-            'container'       => 'div',

-            'container_id'    => 'header-menu-right-id',

-            'container_class' => 'header-menu-right-cl',

-            'menu_id'         => 'header-menu-id',

-            'menu_class'      => 'header-menu-cl',

-            'echo'            => true,

-            'fallback_cb'     => '',

-            'before'          => '',

-            'after'           => '',

-            'link_before'     => '<span>',

-            'link_after'      => '</span>',

-            'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

-            'depth'           => 0,

-            'walker'          => ''

-        )

-    );

-    }

+	if ( has_nav_menu( 'header-menu-right' ) ) {

+	wp_nav_menu(

+		array(

+			'theme_location'  => 'header-menu-right',

+			'menu'            => '',

+			'container'       => 'div',

+			'container_id'    => 'header-menu-right-id',

+			'container_class' => 'header-menu-right-cl',

+			'menu_id'         => 'header-menu-id',

+			'menu_class'      => 'header-menu-cl',

+			'echo'            => true,

+			'fallback_cb'     => '',

+			'before'          => '',

+			'after'           => '',

+			'link_before'     => '<span>',

+			'link_after'      => '</span>',

+			'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

+			'depth'           => 0,

+			'walker'          => ''

+		)

+	);

+	}

 }

 

 //Fotter menu

 function lighthouse_footer_menu() {

-    if ( has_nav_menu( 'footer-menu' ) ) {

-    wp_nav_menu(

-        array(

-            'theme_location'  => 'footer-menu',

-            'menu'            => '',

-            'container'       => 'div',

-            'container_id'    => 'footer-menu-id',

-            'container_class' => 'footer-menu-cl',

-            'menu_id'         => 'footer-menu-id',

-            'menu_class'      => 'footer-menu-cl',

-            'echo'            => true,

-            'fallback_cb'     => '',

-            'before'          => '',

-            'after'           => '',

-            'link_before'     => '',

-            'link_after'      => '',

-            'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

-            'depth'           => 0,

-            'walker'          => ''

-        )

-    );

-    }

+	if ( has_nav_menu( 'footer-menu' ) ) {

+	wp_nav_menu(

+		array(

+			'theme_location'  => 'footer-menu',

+			'menu'            => '',

+			'container'       => 'div',

+			'container_id'    => 'footer-menu-id',

+			'container_class' => 'footer-menu-cl',

+			'menu_id'         => 'footer-menu-id',

+			'menu_class'      => 'footer-menu-cl',

+			'echo'            => true,

+			'fallback_cb'     => '',

+			'before'          => '',

+			'after'           => '',

+			'link_before'     => '',

+			'link_after'      => '',

+			'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

+			'depth'           => 0,

+			'walker'          => ''

+		)

+	);

+	}

 }

 

 //Menu footer-bottom

 function lighthouse_footer_menu_bottom() {

-    if ( has_nav_menu( 'footer-menu-bottom' ) ) {

-    wp_nav_menu(

-        array(

-            'theme_location'  => 'footer-menu-bottom',

-            'menu'            => '',

-            'container'       => 'div',

-            'container_id'    => 'footer-menu-bottom-id',

-            'container_class' => 'footer-menu-bottom-cl',

-            'menu_id'         => 'footer-menu-id',

-            'menu_class'      => 'footer-menu-cl',

-            'echo'            => true,

-            'fallback_cb'     => '',

-            'before'          => '',

-            'after'           => '',

-            'link_before'     => '',

-            'link_after'      => '',

-            'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

-            'depth'           => 0,

-            'walker'          => ''

-        )

-    );

-    }

+	if ( has_nav_menu( 'footer-menu-bottom' ) ) {

+	wp_nav_menu(

+		array(

+			'theme_location'  => 'footer-menu-bottom',

+			'menu'            => '',

+			'container'       => 'div',

+			'container_id'    => 'footer-menu-bottom-id',

+			'container_class' => 'footer-menu-bottom-cl',

+			'menu_id'         => 'footer-menu-id',

+			'menu_class'      => 'footer-menu-cl',

+			'echo'            => true,

+			'fallback_cb'     => '',

+			'before'          => '',

+			'after'           => '',

+			'link_before'     => '',

+			'link_after'      => '',

+			'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',

+			'depth'           => 0,

+			'walker'          => ''

+		)

+	);

+	}

 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -7,15 +7,15 @@ 
 function lighthouse_menus() {

     register_nav_menus(

         array(

-            'header-menu-left' => __( 'Header menu left', 'nav menu location', 'lighthouse' ),

-            'header-menu-right' => __( 'Header menu right' , 'nav menu location', 'lighthouse'),

-            'footer-menu' => __( 'Footer menu' , 'nav menu location', 'lighthouse'),

-            'footer-menu-bottom' => __( 'Footer menu bottom' , 'nav menu location', 'lighthouse')

+            'header-menu-left' => __('Header menu left', 'nav menu location', 'lighthouse'),

+            'header-menu-right' => __('Header menu right', 'nav menu location', 'lighthouse'),

+            'footer-menu' => __('Footer menu', 'nav menu location', 'lighthouse'),

+            'footer-menu-bottom' => __('Footer menu bottom', 'nav menu location', 'lighthouse')

             )

         );

 }

 

-add_action( 'init', 'lighthouse_menus' );

+add_action('init', 'lighthouse_menus');

 

 

 /*

@@ -25,7 +25,7 @@ 
 

 //Left menu

 function lighthouse_header_menu_left() {

-    if ( has_nav_menu( 'header-menu-left' ) ) {

+    if (has_nav_menu('header-menu-left')) {

     wp_nav_menu(

         array(

             'theme_location'  => 'header-menu-left',

@@ -51,7 +51,7 @@ 
 

 //Right menu

 function lighthouse_header_menu_right() {

-    if ( has_nav_menu( 'header-menu-right' ) ) {

+    if (has_nav_menu('header-menu-right')) {

     wp_nav_menu(

         array(

             'theme_location'  => 'header-menu-right',

@@ -77,7 +77,7 @@ 
 

 //Fotter menu

 function lighthouse_footer_menu() {

-    if ( has_nav_menu( 'footer-menu' ) ) {

+    if (has_nav_menu('footer-menu')) {

     wp_nav_menu(

         array(

             'theme_location'  => 'footer-menu',

@@ -103,7 +103,7 @@ 
 

 //Menu footer-bottom

 function lighthouse_footer_menu_bottom() {

-    if ( has_nav_menu( 'footer-menu-bottom' ) ) {

+    if (has_nav_menu('footer-menu-bottom')) {

     wp_nav_menu(

         array(

             'theme_location'  => 'footer-menu-bottom',

includes/theme-settings.php

Spacing +16 added lines, -16 removed lines

@@ -3,11 +3,11 @@ 
 /**

  * Read More button in excerpt

  */

-function new_excerpt_more( $more ) {

-	return '... <a class="readmore" href="' . get_permalink() . ' ">Read more <i class="fa fa-external-link"></i></a>';

+function new_excerpt_more($more) {

+	return '... <a class="readmore" href="'.get_permalink().' ">Read more <i class="fa fa-external-link"></i></a>';

 }

 

-add_filter( 'excerpt_more', 'new_excerpt_more' );

+add_filter('excerpt_more', 'new_excerpt_more');

 

 /**

  * Custome Lenght of excerpt

@@ -23,37 +23,37 @@ 
  */

 function pagination($pages = '', $range = 4)

 {  

-	$showitems = ($range * 2)+1;  

+	$showitems = ($range * 2) + 1;  

 

 	global $paged;

-	if(empty($paged)) $paged = 1;

+	if (empty($paged)) $paged = 1;

 

-	if($pages == '')

+	if ($pages == '')

 	{

 		global $wp_query;

 		$pages = $wp_query->max_num_pages;

-		if(!$pages)

+		if ( ! $pages)

 		{

 			$pages = 1;

 		}

 	}   

 

-	if(1 != $pages)

+	if (1 != $pages)

 	{

 		echo "<div class=\"pagination\"><span>Page ".$paged." of ".$pages."</span>";

-		if($paged > 2 && $paged > $range+1 && $showitems < $pages) echo "<a href='".get_pagenum_link(1)."'>&laquo; First</a>";

-		if($paged > 1 && $showitems < $pages) echo "<a href='".get_pagenum_link($paged - 1)."'>&lsaquo; Previous</a>";

+		if ($paged > 2 && $paged > $range + 1 && $showitems < $pages) echo "<a href='".get_pagenum_link(1)."'>&laquo; First</a>";

+		if ($paged > 1 && $showitems < $pages) echo "<a href='".get_pagenum_link($paged - 1)."'>&lsaquo; Previous</a>";

 

-		for ($i=1; $i <= $pages; $i++)

+		for ($i = 1; $i <= $pages; $i++)

 		{

-			if (1 != $pages &&( !($i >= $paged+$range+1 || $i <= $paged-$range-1) || $pages <= $showitems ))

+			if (1 != $pages && ( ! ($i >= $paged + $range + 1 || $i <= $paged - $range - 1) || $pages <= $showitems))

 			{

-				echo ($paged == $i)? "<span class=\"current\">".$i."</span>":"<a href='".get_pagenum_link($i)."' class=\"inactive\">".$i."</a>";

+				echo ($paged == $i) ? "<span class=\"current\">".$i."</span>" : "<a href='".get_pagenum_link($i)."' class=\"inactive\">".$i."</a>";

 			}

 		}

 

 		if ($paged < $pages && $showitems < $pages) echo "<a href=\"".get_pagenum_link($paged + 1)."\">Next &rsaquo;</a>";  

-		if ($paged < $pages-1 &&  $paged+$range-1 < $pages && $showitems < $pages) echo "<a href='".get_pagenum_link($pages)."'>Last &raquo;</a>";

+		if ($paged < $pages - 1 && $paged + $range - 1 < $pages && $showitems < $pages) echo "<a href='".get_pagenum_link($pages)."'>Last &raquo;</a>";

 		echo "</div>\n";

 	}

 }

@@ -62,7 +62,7 @@ 
 /**

  * stop wp removing div tags

  */

-function tinymce_settings( $settings ) {

+function tinymce_settings($settings) {

 

     // html elements being stripped

 	$settings['extended_valid_elements'] = 'div[*],article[*]';

@@ -93,4 +93,4 @@ 
 	return $settings;

 }

 

-add_filter( 'tiny_mce_before_init', 'tinymce_settings' );
\ No newline at end of file
+add_filter('tiny_mce_before_init', 'tinymce_settings');
\ No newline at end of file

Braces +15 added lines, -5 removed lines

@@ -26,7 +26,9 @@ 
 	$showitems = ($range * 2)+1;  

 

 	global $paged;

-	if(empty($paged)) $paged = 1;

+	if(empty($paged)) {
+		$paged = 1;
+	}
 

 	if($pages == '')

 	{

@@ -41,8 +43,12 @@ 
 	if(1 != $pages)

 	{

 		echo "<div class=\"pagination\"><span>Page ".$paged." of ".$pages."</span>";

-		if($paged > 2 && $paged > $range+1 && $showitems < $pages) echo "<a href='".get_pagenum_link(1)."'>&laquo; First</a>";

-		if($paged > 1 && $showitems < $pages) echo "<a href='".get_pagenum_link($paged - 1)."'>&lsaquo; Previous</a>";

+		if($paged > 2 && $paged > $range+1 && $showitems < $pages) {
+			echo "<a href='".get_pagenum_link(1)."'>&laquo; First</a>";
+		}
+		if($paged > 1 && $showitems < $pages) {
+			echo "<a href='".get_pagenum_link($paged - 1)."'>&lsaquo; Previous</a>";
+		}
 

 		for ($i=1; $i <= $pages; $i++)

 		{

@@ -52,8 +58,12 @@ 
 			}

 		}

 

-		if ($paged < $pages && $showitems < $pages) echo "<a href=\"".get_pagenum_link($paged + 1)."\">Next &rsaquo;</a>";  

-		if ($paged < $pages-1 &&  $paged+$range-1 < $pages && $showitems < $pages) echo "<a href='".get_pagenum_link($pages)."'>Last &raquo;</a>";

+		if ($paged < $pages && $showitems < $pages) {
+			echo "<a href=\"".get_pagenum_link($paged + 1)."\">Next &rsaquo;</a>";
+		}
+		if ($paged < $pages-1 &&  $paged+$range-1 < $pages && $showitems < $pages) {
+			echo "<a href='".get_pagenum_link($pages)."'>Last &raquo;</a>";
+		}
 		echo "</div>\n";

 	}

 }

Indentation +7 added lines, -7 removed lines

@@ -64,31 +64,31 @@
  */

 function tinymce_settings( $settings ) {

 

-    // html elements being stripped

+	// html elements being stripped

 	$settings['extended_valid_elements'] = 'div[*],article[*]';

 

-    // only html elements to keep

-    //$settings['valid_elements'] = 'a,strong/b,div,h1,h2,h3,section';

+	// only html elements to keep

+	//$settings['valid_elements'] = 'a,strong/b,div,h1,h2,h3,section';

 

 	// paste elements to keep

 	//$opts = '*[*]';

 	//$settings['paste_word_valid_elements'] = $opts;

 

-    // don't remove line breaks

+	// don't remove line breaks

 	//$settings['remove_linebreaks'] = false;

 

 	$settings['allow_html_in_named_anchor'] = true;

 

-    // convert newline characters to BR

+	// convert newline characters to BR

 	//$settings['convert_newlines_to_brs'] = true;

 

-    // don't remove redundant BR

+	// don't remove redundant BR

 	//$settings['remove_redundant_brs'] = false;

 

 	// only html elements to keep

 	//$settings['wpautop'] = false;

 

-    // pass back to wordpress

+	// pass back to wordpress

 

 	return $settings;

 }