rousnay / lighthouse

includes/acf/fields/taxonomy.php

Spacing +152 added lines, -152 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_taxonomy') ) :
+if ( ! class_exists('acf_field_taxonomy')) :
 
 class acf_field_taxonomy extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'taxonomy';
-		$this->label = __("Taxonomy",'acf');
+		$this->label = __("Taxonomy", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'taxonomy' 			=> 'category',
@@ -49,9 +49,9 @@ 
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/taxonomy/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/taxonomy/query',	array($this, 'ajax_query'));
-		add_action('wp_ajax_acf/fields/taxonomy/add_term',		array($this, 'ajax_add_term'));
+		add_action('wp_ajax_acf/fields/taxonomy/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/taxonomy/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/taxonomy/add_term', array($this, 'ajax_add_term'));
 		
 		
 		// do not delete!
@@ -73,7 +73,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
    		// defaults
    		$options = acf_parse_args($options, array(
@@ -85,9 +85,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -97,7 +97,7 @@ 
 		// vars
    		$r = array();
 		$args = array();
-		$is_hierarchical = is_taxonomy_hierarchical( $field['taxonomy'] );
+		$is_hierarchical = is_taxonomy_hierarchical($field['taxonomy']);
 		$is_pagination = ($options['paged'] > 0);
 		$limit = 20;
 		$offset = 20 * ($options['paged'] - 1);
@@ -109,7 +109,7 @@ 
 		
 		// pagination
 		// - don't bother for hierarchial terms, we will need to load all terms anyway
-		if( !$is_hierarchical && $is_pagination ) {
+		if ( ! $is_hierarchical && $is_pagination) {
 			
 			$args['offset'] = $offset;
 			$args['number'] = $limit;
@@ -118,7 +118,7 @@ 
 		
 		
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 		
 			$args['search'] = $options['s'];
 		
@@ -127,32 +127,32 @@ 
 		
 		// filters
 		$args = apply_filters('acf/fields/taxonomy/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/taxonomy/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/taxonomy/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/taxonomy/query/name='.$field['name'], $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/taxonomy/query/key='.$field['key'], $args, $field, $options['post_id']);
 			
 		
 		// get terms
-		$terms = get_terms( $field['taxonomy'], $args );
+		$terms = get_terms($field['taxonomy'], $args);
 		
 		
 		// sort into hierachial order!
-		if( $is_hierarchical ) {
+		if ($is_hierarchical) {
 			
 			// get parent
-			$parent = acf_maybe_get( $args, 'parent', 0 );
-			$parent = acf_maybe_get( $args, 'child_of', $parent );
+			$parent = acf_maybe_get($args, 'parent', 0);
+			$parent = acf_maybe_get($args, 'child_of', $parent);
 			
 			
 			// this will fail if a search has taken place because parents wont exist
-			if( empty($args['search']) ) {
+			if (empty($args['search'])) {
 			
-				$terms = _get_term_children( $parent, $terms, $field['taxonomy'] );
+				$terms = _get_term_children($parent, $terms, $field['taxonomy']);
 				
 			}
 			
 			
 			// fake pagination
-			if( $is_pagination ) {
+			if ($is_pagination) {
 				
 				$terms = array_slice($terms, $offset, $limit);
 				
@@ -162,12 +162,12 @@ 
 		
 		
 		/// append to r
-		foreach( $terms as $term ) {
+		foreach ($terms as $term) {
 		
 			// add to json
 			$r[] = array(
 				'id'	=> $term->term_id,
-				'text'	=> $this->get_term_title( $term, $field, $options['post_id'] )
+				'text'	=> $this->get_term_title($term, $field, $options['post_id'])
 			);
 			
 		}
@@ -195,7 +195,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -203,11 +203,11 @@ 
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$choices = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$choices ) {
+		if ( ! $choices) {
 			
 			die();
 			
@@ -215,7 +215,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $choices );
+		echo json_encode($choices);
 		die();
 			
 	}
@@ -236,14 +236,14 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_term_title( $term, $field, $post_id = 0 ) {
+	function get_term_title($term, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$form_data = acf_get_setting('form_data');
 			
-			if( !empty($form_data['post_id']) ) {
+			if ( ! empty($form_data['post_id'])) {
 				
 				$post_id = $form_data['post_id'];
 				
@@ -260,9 +260,9 @@ 
 		
 		
 		// ancestors
-		$ancestors = get_ancestors( $term->term_id, $field['taxonomy'] );
+		$ancestors = get_ancestors($term->term_id, $field['taxonomy']);
 		
-		if( !empty($ancestors) ) {
+		if ( ! empty($ancestors)) {
 		
 			$title .= str_repeat('- ', count($ancestors));
 			
@@ -275,8 +275,8 @@ 
 		
 		// filters
 		$title = apply_filters('acf/fields/taxonomy/result', $title, $term, $field, $post_id);
-		$title = apply_filters('acf/fields/taxonomy/result/name=' . $field['_name'] , $title, $term, $field, $post_id);
-		$title = apply_filters('acf/fields/taxonomy/result/key=' . $field['key'], $title, $term, $field, $post_id);
+		$title = apply_filters('acf/fields/taxonomy/result/name='.$field['_name'], $title, $term, $field, $post_id);
+		$title = apply_filters('acf/fields/taxonomy/result/key='.$field['key'], $title, $term, $field, $post_id);
 		
 		
 		// return
@@ -297,10 +297,10 @@ 
 	*  @return	$value
 	*/
 	
-	function get_terms( $value, $taxonomy = 'category' ) {
+	function get_terms($value, $taxonomy = 'category') {
 		
 		// load terms in 1 query to save multiple DB calls from following code
-		if( count($value) > 1 ) {
+		if (count($value) > 1) {
 			
 			$terms = get_terms($taxonomy, array(
 				'hide_empty'	=> false,
@@ -311,9 +311,9 @@ 
 		
 		
 		// update value to include $post
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
-			$value[ $i ] = get_term( $value[ $i ], $taxonomy );
+			$value[$i] = get_term($value[$i], $taxonomy);
 			
 		}
 		
@@ -343,21 +343,21 @@ 
 	*  @return	$value - the value to be saved in te database
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// get valid terms
 		$value = acf_get_valid_terms($value, $field['taxonomy']);
 		
 		
 		// load/save
-		if( $field['load_terms'] ) {
+		if ($field['load_terms']) {
 			
 			// get terms
 			$term_ids = wp_get_object_terms($post_id, $field['taxonomy'], array('fields' => 'ids', 'orderby' => 'none'));
 			
 			
 			// error
-			if( is_wp_error($term_ids) ) {
+			if (is_wp_error($term_ids)) {
 				
 				return false;
 					
@@ -392,10 +392,10 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 		
 		// vars
-		if( is_array($value) ) {
+		if (is_array($value)) {
 		
 			$value = array_filter($value);
 			
@@ -403,14 +403,14 @@ 
 		
 		
 		// save_terms
-		if( $field['save_terms'] ) {
+		if ($field['save_terms']) {
 			
 			// vars
 			$taxonomy = $field['taxonomy'];
 			
 			
 			// force value to array
-			$term_ids = acf_get_array( $value );
+			$term_ids = acf_get_array($value);
 			
 			
 			// convert to int
@@ -418,9 +418,9 @@ 
 			
 			
 			// bypass $this->set_terms if called directly from update_field
-			if( !did_action('acf/save_post') ) {
+			if ( ! did_action('acf/save_post')) {
 				
-				wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
+				wp_set_object_terms($post_id, $term_ids, $taxonomy, false);
 				
 				return $value;
 				
@@ -428,7 +428,7 @@ 
 			
 			
 			// initialize
-			if( empty($this->set_terms) ) {
+			if (empty($this->set_terms)) {
 				
 				// create holder
 				$this->set_terms = array();
@@ -441,13 +441,13 @@ 
 			
 			
 			// append
-			if( empty($this->set_terms[ $taxonomy ]) ) {
+			if (empty($this->set_terms[$taxonomy])) {
 				
-				$this->set_terms[ $taxonomy ] = array();
+				$this->set_terms[$taxonomy] = array();
 				
 			}
 			
-			$this->set_terms[ $taxonomy ] = array_merge($this->set_terms[ $taxonomy ], $term_ids);
+			$this->set_terms[$taxonomy] = array_merge($this->set_terms[$taxonomy], $term_ids);
 			
 		}
 		
@@ -471,10 +471,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function set_terms( $post_id ) {
+	function set_terms($post_id) {
 		
 		// bail ealry if no terms
-		if( empty($this->set_terms) ) {
+		if (empty($this->set_terms)) {
 			
 			return;
 			
@@ -482,9 +482,9 @@ 
 		
 		
 		// loop over terms
-		foreach( $this->set_terms as $taxonomy => $term_ids ){
+		foreach ($this->set_terms as $taxonomy => $term_ids) {
 			
-			wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
+			wp_set_object_terms($post_id, $term_ids, $taxonomy, false);
 			
 		}
 		
@@ -511,10 +511,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 $value;
 		
@@ -522,7 +522,7 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// convert values to int
@@ -530,16 +530,16 @@ 
 		
 		
 		// load posts if needed
-		if( $field['return_format'] == 'object' ) {
+		if ($field['return_format'] == 'object') {
 			
 			// get posts
-			$value = $this->get_terms( $value, $field["taxonomy"] );
+			$value = $this->get_terms($value, $field["taxonomy"]);
 		
 		}
 		
 		
 		// convert back from array if neccessary
-		if( $field['field_type'] == 'select' || $field['field_type'] == 'radio' ) {
+		if ($field['field_type'] == 'select' || $field['field_type'] == 'radio') {
 			
 			$value = array_shift($value);
 			
@@ -563,10 +563,10 @@ 
 	*  @param	$field - an array holding all the field's data
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// force value to array
-		$field['value'] = acf_get_array( $field['value'] );
+		$field['value'] = acf_get_array($field['value']);
 		
 		
 		// convert values to int
@@ -583,33 +583,33 @@ 
 		
 		
 		// get taxonomy
-		$taxonomy = get_taxonomy( $field['taxonomy'] );
+		$taxonomy = get_taxonomy($field['taxonomy']);
 		
 		?>
 <div <?php acf_esc_attr_e($div); ?>>
-	<?php if( $field['add_term'] && current_user_can( $taxonomy->cap->manage_terms) ): ?>
+	<?php if ($field['add_term'] && current_user_can($taxonomy->cap->manage_terms)): ?>
 	<a href="#" class="acf-icon -plus acf-js-tooltip small acf-soh-target" data-name="add" title="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>"></a>
 	<?php endif;
 
-	if( $field['field_type'] == 'select' ) {
+	if ($field['field_type'] == 'select') {
 	
 		$field['multiple'] = 0;
 		
-		$this->render_field_select( $field );
+		$this->render_field_select($field);
 	
-	} elseif( $field['field_type'] == 'multi_select' ) {
+	} elseif ($field['field_type'] == 'multi_select') {
 		
 		$field['multiple'] = 1;
 		
-		$this->render_field_select( $field );
+		$this->render_field_select($field);
 	
-	} elseif( $field['field_type'] == 'radio' ) {
+	} elseif ($field['field_type'] == 'radio') {
 		
-		$this->render_field_checkbox( $field );
+		$this->render_field_checkbox($field);
 		
-	} elseif( $field['field_type'] == 'checkbox' ) {
+	} elseif ($field['field_type'] == 'checkbox') {
 	
-		$this->render_field_checkbox( $field );
+		$this->render_field_checkbox($field);
 		
 	}
 
@@ -631,7 +631,7 @@ 
 	*  @param	$field - an array holding all the field's data
 	*/
 	
-	function render_field_select( $field ) {
+	function render_field_select($field) {
 		
 		// Change Field into a select
 		$field['type'] = 'select';
@@ -641,23 +641,23 @@ 
 		
 		
 		// value
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			// get terms
-			$terms = $this->get_terms( $field['value'], $field['taxonomy'] );
+			$terms = $this->get_terms($field['value'], $field['taxonomy']);
 			
 			
 			// set choices
-			if( !empty($terms) ) {
+			if ( ! empty($terms)) {
 				
-				foreach( array_keys($terms) as $i ) {
+				foreach (array_keys($terms) as $i) {
 					
 					// vars
-					$term = acf_extract_var( $terms, $i );
+					$term = acf_extract_var($terms, $i);
 					
 					
 					// append to choices
-					$field['choices'][ $term->term_id ] = $this->get_term_title( $term, $field );
+					$field['choices'][$term->term_id] = $this->get_term_title($term, $field);
 				
 				}
 				
@@ -667,7 +667,7 @@ 
 		
 		
 		// render select		
-		acf_render_field( $field );
+		acf_render_field($field);
 		
 	}
 	
@@ -684,7 +684,7 @@ 
 	*  @param	$field - an array holding all the field's data
 	*/
 	
-	function render_field_checkbox( $field ) {
+	function render_field_checkbox($field) {
 		
 		// hidden input
 		acf_hidden_input(array(
@@ -694,7 +694,7 @@ 
 		
 		
 		// checkbox saves an array
-		if( $field['field_type'] == 'checkbox' ) {
+		if ($field['field_type'] == 'checkbox') {
 		
 			$field['name'] .= '[]';
 			
@@ -708,23 +708,23 @@ 
 		// vars
 		$args = array(
 			'taxonomy'     		=> $field['taxonomy'],
-			'show_option_none'	=> __('No', 'acf') . ' ' . $taxonomy_obj->labels->name,
+			'show_option_none'	=> __('No', 'acf').' '.$taxonomy_obj->labels->name,
 			'hide_empty'   		=> false,
 			'style'        		=> 'none',
-			'walker'       		=> new acf_taxonomy_field_walker( $field ),
+			'walker'       		=> new acf_taxonomy_field_walker($field),
 		);
 		
 		
 		// filter for 3rd party customization
 		$args = apply_filters('acf/fields/taxonomy/wp_list_categories', $args, $field);
-		$args = apply_filters('acf/fields/taxonomy/wp_list_categories/name=' . $field['_name'], $args, $field);
-		$args = apply_filters('acf/fields/taxonomy/wp_list_categories/key=' . $field['key'], $args, $field);
+		$args = apply_filters('acf/fields/taxonomy/wp_list_categories/name='.$field['_name'], $args, $field);
+		$args = apply_filters('acf/fields/taxonomy/wp_list_categories/key='.$field['key'], $args, $field);
 		
 		?><div class="categorychecklist-holder">
 		
 			<ul class="acf-checkbox-list acf-bl">
 			
-				<?php if( $field['field_type'] == 'radio' && $field['allow_null'] ): ?>
+				<?php if ($field['field_type'] == 'radio' && $field['allow_null']): ?>
 					<li>
 						<label class="selectit">
 							<input type="radio" name="<?php echo $field['name']; ?>" value="" /> <?php _e("None", 'acf'); ?>
@@ -732,7 +732,7 @@ 
 					</li>
 				<?php endif; ?>
 				
-				<?php wp_list_categories( $args ); ?>
+				<?php wp_list_categories($args); ?>
 		
 			</ul>
 			
@@ -754,12 +754,12 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Taxonomy','acf'),
-			'instructions'	=> __('Select the taxonomy to be displayed','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Taxonomy', 'acf'),
+			'instructions'	=> __('Select the taxonomy to be displayed', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'taxonomy',
 			'choices'		=> acf_get_taxonomies(),
@@ -767,18 +767,18 @@ 
 		
 		
 		// field_type
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Appearance','acf'),
-			'instructions'	=> __('Select the appearance of this field','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Appearance', 'acf'),
+			'instructions'	=> __('Select the appearance of this field', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'field_type',
 			'optgroup'		=> true,
 			'choices'		=> array(
-				__("Multiple Values",'acf') => array(
+				__("Multiple Values", 'acf') => array(
 					'checkbox' => __('Checkbox', 'acf'),
 					'multi_select' => __('Multi Select', 'acf')
 				),
-				__("Single Value",'acf') => array(
+				__("Single Value", 'acf') => array(
 					'radio' => __('Radio Buttons', 'acf'),
 					'select' => __('Select', 'acf')
 				)
@@ -787,70 +787,70 @@ 
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// add_term
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Create Terms','acf'),
-			'instructions'	=> __('Allow new terms to be created whilst editing','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Create Terms', 'acf'),
+			'instructions'	=> __('Allow new terms to be created whilst editing', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'add_term',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// save_terms
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Save Terms','acf'),
-			'instructions'	=> __('Connect selected terms to the post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Save Terms', 'acf'),
+			'instructions'	=> __('Connect selected terms to the post', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'save_terms',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// load_terms
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Load Terms','acf'),
-			'instructions'	=> __('Load value from posts terms','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Load Terms', 'acf'),
+			'instructions'	=> __('Load value from posts terms', 'acf'),
 			'type'			=> 'radio',
 			'name'			=> 'load_terms',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// return_format
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Return Value','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Return Value', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'return_format',
 			'choices'		=> array(
-				'object'		=>	__("Term Object",'acf'),
-				'id'			=>	__("Term ID",'acf')
+				'object'		=>	__("Term Object", 'acf'),
+				'id'			=>	__("Term ID", 'acf')
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -883,7 +883,7 @@ 
 		
 		
 		// verify nonce
-		if( ! wp_verify_nonce($args['nonce'], 'acf_nonce') ) {
+		if ( ! wp_verify_nonce($args['nonce'], 'acf_nonce')) {
 		
 			die();
 			
@@ -891,9 +891,9 @@ 
 		
 		
 		// load field
-		$field = acf_get_field( $args['field_key'] );
+		$field = acf_get_field($args['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			die();
 			
@@ -907,22 +907,22 @@ 
 			
 		// validate cap
 		// note: this situation should never occur due to condition of the add new button
-		if( !current_user_can( $taxonomy_obj->cap->manage_terms) ) {
+		if ( ! current_user_can($taxonomy_obj->cap->manage_terms)) {
 			
-			echo '<p><strong>' . __("Error", 'acf') . '.</strong> ' . sprintf( __('User unable to add new %s', 'acf'), $taxonomy_label ) . '</p>';
+			echo '<p><strong>'.__("Error", 'acf').'.</strong> '.sprintf(__('User unable to add new %s', 'acf'), $taxonomy_label).'</p>';
 			die;
 			
 		}
 	
 		
 		// save?
-		if( $args['term_name'] ) {
+		if ($args['term_name']) {
 			
 			// exists
-			if( term_exists($args['term_name'], $field['taxonomy']) ) {
+			if (term_exists($args['term_name'], $field['taxonomy'])) {
 				
 				wp_send_json_error(array(
-					'error'	=> sprintf( __('%s already exists', 'acf'), $taxonomy_label )
+					'error'	=> sprintf(__('%s already exists', 'acf'), $taxonomy_label)
 				));
 			
 			}
@@ -931,17 +931,17 @@ 
 			// insert
 			$extra = array();
 			
-			if( $args['term_parent'] ) {
+			if ($args['term_parent']) {
 				
 				$extra['parent'] = $args['term_parent'];
 				
 			}
 			
-			$data = wp_insert_term( $args['term_name'], $field['taxonomy'], $extra );
+			$data = wp_insert_term($args['term_name'], $field['taxonomy'], $extra);
 			
 			
 			// error?
-			if( is_wp_error($data) ) {
+			if (is_wp_error($data)) {
 				
 				wp_send_json_error(array(
 					'error'	=> $data->get_error_message()
@@ -952,9 +952,9 @@ 
 			
 			// ancestors
 			$prefix = '';
-			$ancestors = get_ancestors( $data['term_id'], $field['taxonomy'] );
+			$ancestors = get_ancestors($data['term_id'], $field['taxonomy']);
 			
-			if( !empty($ancestors) ) {
+			if ( ! empty($ancestors)) {
 			
 				$prefix = str_repeat('- ', count($ancestors));
 				
@@ -963,10 +963,10 @@ 
 		
 			// success
 			wp_send_json_success(array(
-				'message'		=> sprintf( __('%s added', 'acf'), $taxonomy_label ),
+				'message'		=> sprintf(__('%s added', 'acf'), $taxonomy_label),
 				'term_id'		=> $data['term_id'],
 				'term_name'		=> $args['term_name'],
-				'term_label'	=> $prefix . $args['term_name'],
+				'term_label'	=> $prefix.$args['term_name'],
 				'term_parent'	=> $args['term_parent']
 			));
 				
@@ -981,16 +981,16 @@ 
 		));
 		
 		
-		if( is_taxonomy_hierarchical( $field['taxonomy'] ) ) {
+		if (is_taxonomy_hierarchical($field['taxonomy'])) {
 			
 			$choices = array();
-			$choices2 = $this->get_choices(array( 'field_key' => $field['key'] ));
+			$choices2 = $this->get_choices(array('field_key' => $field['key']));
 			
-			if( $choices2 ) {
+			if ($choices2) {
 				
-				foreach( $choices2 as $v) { 
+				foreach ($choices2 as $v) { 
 					
-					$choices[ $v['id'] ] = $v['text'];
+					$choices[$v['id']] = $v['text'];
 					
 				}
 				
@@ -1023,49 +1023,49 @@ 
 
 endif;
 
-if( ! class_exists('acf_taxonomy_field_walker') ) :
+if ( ! class_exists('acf_taxonomy_field_walker')) :
 
 class acf_taxonomy_field_walker extends Walker {
 	
 	var $field = null,
 		$tree_type = 'category',
-		$db_fields = array ( 'parent' => 'parent', 'id' => 'term_id' );
+		$db_fields = array('parent' => 'parent', 'id' => 'term_id');
 	
-	function __construct( $field ) {
+	function __construct($field) {
 	
 		$this->field = $field;
 		
 	}
 
-	function start_el( &$output, $term, $depth = 0, $args = array(), $current_object_id = 0) {
+	function start_el(&$output, $term, $depth = 0, $args = array(), $current_object_id = 0) {
 		
 		// vars
-		$selected = in_array( $term->term_id, $this->field['value'] );
+		$selected = in_array($term->term_id, $this->field['value']);
 		
 		
 		// append
-		$output .= '<li data-id="' . $term->term_id . '"><label><input type="' . $this->field['field_type'] . '" name="' . $this->field['name'] . '" value="' . $term->term_id . '" ' . ($selected ? 'checked="checked"' : '') . ' /> <span>' . $term->name . '</span></label>';
+		$output .= '<li data-id="'.$term->term_id.'"><label><input type="'.$this->field['field_type'].'" name="'.$this->field['name'].'" value="'.$term->term_id.'" '.($selected ? 'checked="checked"' : '').' /> <span>'.$term->name.'</span></label>';
 				
 	}
 	
-	function end_el( &$output, $term, $depth = 0, $args = array() ) {
+	function end_el(&$output, $term, $depth = 0, $args = array()) {
 	
 		// append
-		$output .= '</li>' .  "\n";
+		$output .= '</li>'."\n";
 		
 	}
 	
-	function start_lvl( &$output, $depth = 0, $args = array() ) {
+	function start_lvl(&$output, $depth = 0, $args = array()) {
 		
 		// append
-		$output .= '<ul class="children acf-bl">' . "\n";
+		$output .= '<ul class="children acf-bl">'."\n";
 		
 	}
 
-	function end_lvl( &$output, $depth = 0, $args = array() ) {
+	function end_lvl(&$output, $depth = 0, $args = array()) {
 	
 		// append
-		$output .= '</ul>' . "\n";
+		$output .= '</ul>'."\n";
 		
 	}
 	

includes/acf/fields/text.php

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_text') ) :
+if ( ! class_exists('acf_field_text')) :
 
 class acf_field_text extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'text';
-		$this->label = __("Text",'acf');
+		$this->label = __("Text", 'acf');
 		$this->defaults = array(
 			'default_value'	=> '',
 			'maxlength'		=> '',
@@ -62,16 +62,16 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
-		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
-		$s = array( 'readonly', 'disabled' );
+		$o = array('type', 'id', 'class', 'name', 'value', 'placeholder');
+		$s = array('readonly', 'disabled');
 		$e = '';
 		
 		
 		// maxlength
-		if( $field['maxlength'] !== "" ) {
+		if ($field['maxlength'] !== "") {
 		
 			$o[] = 'maxlength';
 			
@@ -79,38 +79,38 @@ 
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if ($field['prepend'] !== "") {
 		
 			$field['class'] .= ' acf-is-prepended';
-			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
+			$e .= '<div class="acf-input-prepend">'.$field['prepend'].'</div>';
 			
 		}
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if ($field['append'] !== "") {
 		
 			$field['class'] .= ' acf-is-appended';
-			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
+			$e .= '<div class="acf-input-append">'.$field['append'].'</div>';
 			
 		}
 		
 		
 		// populate atts
 		$atts = array();
-		foreach( $o as $k ) {
+		foreach ($o as $k) {
 		
-			$atts[ $k ] = $field[ $k ];	
+			$atts[$k] = $field[$k];	
 			
 		}
 		
 		
 		// special atts
-		foreach( $s as $k ) {
+		foreach ($s as $k) {
 		
-			if( $field[ $k ] ) {
+			if ($field[$k]) {
 			
-				$atts[ $k ] = $k;
+				$atts[$k] = $k;
 				
 			}
 			
@@ -119,7 +119,7 @@ 
 		
 		// render
 		$e .= '<div class="acf-input-wrap">';
-		$e .= '<input ' . acf_esc_attr( $atts ) . ' />';
+		$e .= '<input '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -141,48 +141,48 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// placeholder
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Placeholder Text','acf'),
-			'instructions'	=> __('Appears within the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Placeholder Text', 'acf'),
+			'instructions'	=> __('Appears within the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'placeholder',
 		));
 		
 		
 		// prepend
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Prepend','acf'),
-			'instructions'	=> __('Appears before the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Prepend', 'acf'),
+			'instructions'	=> __('Appears before the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'prepend',
 		));
 		
 		
 		// append
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Append','acf'),
-			'instructions'	=> __('Appears after the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Append', 'acf'),
+			'instructions'	=> __('Appears after the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'append',
 		));
 		
 		
 		// maxlength
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Character Limit','acf'),
-			'instructions'	=> __('Leave blank for no limit','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Character Limit', 'acf'),
+			'instructions'	=> __('Leave blank for no limit', 'acf'),
 			'type'			=> 'number',
 			'name'			=> 'maxlength',
 		));

includes/acf/fields/textarea.php

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_textarea') ) :
+if ( ! class_exists('acf_field_textarea')) :
 
 class acf_field_textarea extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'textarea';
-		$this->label = __("Text Area",'acf');
+		$this->label = __("Text Area", 'acf');
 		$this->defaults = array(
 			'default_value'	=> '',
 			'new_lines'		=> '',
@@ -62,16 +62,16 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
-		$o = array( 'id', 'class', 'name', 'placeholder', 'rows' );
-		$s = array( 'readonly', 'disabled' );
+		$o = array('id', 'class', 'name', 'placeholder', 'rows');
+		$s = array('readonly', 'disabled');
 		$e = '';
 		
 		
 		// maxlength
-		if( $field['maxlength'] !== '' ) {
+		if ($field['maxlength'] !== '') {
 		
 			$o[] = 'maxlength';
 			
@@ -79,7 +79,7 @@ 
 		
 		
 		// rows
-		if( empty($field['rows']) ) {
+		if (empty($field['rows'])) {
 		
 			$field['rows'] = 8;
 			
@@ -88,27 +88,27 @@ 
 		
 		// populate atts
 		$atts = array();
-		foreach( $o as $k ) {
+		foreach ($o as $k) {
 		
-			$atts[ $k ] = $field[ $k ];	
+			$atts[$k] = $field[$k];	
 			
 		}
 		
 		
 		// special atts
-		foreach( $s as $k ) {
+		foreach ($s as $k) {
 		
-			if( $field[ $k ] ) {
+			if ($field[$k]) {
 			
-				$atts[ $k ] = $k;
+				$atts[$k] = $k;
 				
 			}
 			
 		}
 		
 
-		$e .= '<textarea ' . acf_esc_attr( $atts ) . ' >';
-		$e .= esc_textarea( $field['value'] );
+		$e .= '<textarea '.acf_esc_attr($atts).' >';
+		$e .= esc_textarea($field['value']);
 		$e .= '</textarea>';
 		
 		
@@ -130,10 +130,10 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// ACF4 migration
-		if( empty($field['ID']) ) {
+		if (empty($field['ID'])) {
 			
 			$field['new_lines'] = 'wpautop';
 			
@@ -141,36 +141,36 @@ 
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// placeholder
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Placeholder Text','acf'),
-			'instructions'	=> __('Appears within the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Placeholder Text', 'acf'),
+			'instructions'	=> __('Appears within the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'placeholder',
 		));
 		
 		
 		// maxlength
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Character Limit','acf'),
-			'instructions'	=> __('Leave blank for no limit','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Character Limit', 'acf'),
+			'instructions'	=> __('Leave blank for no limit', 'acf'),
 			'type'			=> 'number',
 			'name'			=> 'maxlength',
 		));
 		
 		
 		// rows
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Rows','acf'),
-			'instructions'	=> __('Sets the textarea height','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Rows', 'acf'),
+			'instructions'	=> __('Sets the textarea height', 'acf'),
 			'type'			=> 'number',
 			'name'			=> 'rows',
 			'placeholder'	=> 8
@@ -178,15 +178,15 @@ 
 		
 		
 		// formatting
-		acf_render_field_setting( $field, array(
-			'label'			=> __('New Lines','acf'),
-			'instructions'	=> __('Controls how new lines are rendered','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('New Lines', 'acf'),
+			'instructions'	=> __('Controls how new lines are rendered', 'acf'),
 			'type'			=> 'select',
 			'name'			=> 'new_lines',
 			'choices'		=> array(
-				'wpautop'		=> __("Automatically add paragraphs",'acf'),
-				'br'			=> __("Automatically add &lt;br&gt;",'acf'),
-				''				=> __("No Formatting",'acf')
+				'wpautop'		=> __("Automatically add paragraphs", 'acf'),
+				'br'			=> __("Automatically add &lt;br&gt;", 'acf'),
+				''				=> __("No Formatting", 'acf')
 			)
 		));
 		
@@ -209,10 +209,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 or not for template
-		if( empty($value) || !is_string($value) ) {
+		if (empty($value) || ! is_string($value)) {
 			
 			return $value;
 		
@@ -220,11 +220,11 @@ 
 				
 		
 		// new lines
-		if( $field['new_lines'] == 'wpautop' ) {
+		if ($field['new_lines'] == 'wpautop') {
 			
 			$value = wpautop($value);
 			
-		} elseif( $field['new_lines'] == 'br' ) {
+		} elseif ($field['new_lines'] == 'br') {
 			
 			$value = nl2br($value);
 			

includes/acf/fields/true_false.php

Spacing +17 added lines, -17 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_true_false') ) :
+if ( ! class_exists('acf_field_true_false')) :
 
 class acf_field_true_false extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'true_false';
-		$this->label = __("True / False",'acf');
+		$this->label = __("True / False", 'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
 			'default_value'	=> 0,
@@ -59,7 +59,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
 		$atts = array(
@@ -71,7 +71,7 @@ 
 		
 		
 		// checked
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 		
 			$atts['checked'] = 'checked';
 			
@@ -79,9 +79,9 @@ 
 		
 		
 		// html
-		echo '<ul class="acf-checkbox-list acf-bl ' . acf_esc_attr($field['class']) . '">';
-			echo '<input type="hidden" name="' . acf_esc_attr($field['name']) . '" value="0" />';
-			echo '<li><label><input ' . acf_esc_attr($atts) . '/>' . $field['message'] . '</label></li>';
+		echo '<ul class="acf-checkbox-list acf-bl '.acf_esc_attr($field['class']).'">';
+			echo '<input type="hidden" name="'.acf_esc_attr($field['name']).'" value="0" />';
+			echo '<li><label><input '.acf_esc_attr($atts).'/>'.$field['message'].'</label></li>';
 		echo '</ul>';
 	}
 	
@@ -99,20 +99,20 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// message
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Message','acf'),
-			'instructions'	=> __('eg. Show extra content','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Message', 'acf'),
+			'instructions'	=> __('eg. Show extra content', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'message',
 		));
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'true_false',
 			'name'			=> 'default_value',
@@ -137,7 +137,7 @@ 
 	*  @return	$value (mixed) the modified value
 	*/
 	
-	function format_value( $value, $post_id, $field ) {
+	function format_value($value, $post_id, $field) {
 		
 		return empty($value) ? false : true;
 		
@@ -157,10 +157,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// bail early if not required
-		if( ! $field['required'] ) {
+		if ( ! $field['required']) {
 			
 			return $valid;
 			
@@ -168,7 +168,7 @@ 
 		
 		
 		// value may be '0'
-		if( !$value ) {
+		if ( ! $value) {
 			
 			return false;
 			

includes/acf/fields/url.php

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_url') ) :
+if ( ! class_exists('acf_field_url')) :
 
 class acf_field_url extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'url';
-		$this->label = __("Url",'acf');
+		$this->label = __("Url", 'acf');
 		$this->defaults = array(
 			'default_value'	=> '',
 			'placeholder'	=> '',
@@ -57,28 +57,28 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// vars
-		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
+		$o = array('type', 'id', 'class', 'name', 'value', 'placeholder');
 		$e = '';
 		
 		
 		// populate atts
 		$atts = array();
-		foreach( $o as $k ) {
+		foreach ($o as $k) {
 		
-			$atts[ $k ] = $field[ $k ];	
+			$atts[$k] = $field[$k];	
 			
 		}
 		
 		
 		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		foreach (array('readonly', 'disabled') as $k) {
 		
-			if( !empty($field[ $k ]) ) {
+			if ( ! empty($field[$k])) {
 			
-				$atts[ $k ] = $k;
+				$atts[$k] = $k;
 				
 			}
 			
@@ -87,7 +87,7 @@ 
 		
 		// render
 		$e .= '<div class="acf-input-wrap acf-url">';
-		$e .= '<i class="acf-icon -globe small"></i><input ' . acf_esc_attr( $atts ) . ' />';
+		$e .= '<i class="acf-icon -globe small"></i><input '.acf_esc_attr($atts).' />';
 		$e .= '</div>';
 		
 		
@@ -110,21 +110,21 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// placeholder
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Placeholder Text','acf'),
-			'instructions'	=> __('Appears within the input','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Placeholder Text', 'acf'),
+			'instructions'	=> __('Appears within the input', 'acf'),
 			'type'			=> 'text',
 			'name'			=> 'placeholder',
 		));
@@ -145,21 +145,21 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function validate_value( $valid, $value, $field, $input ){
+	function validate_value($valid, $value, $field, $input) {
 		
 		// bail early if empty		
-		if( empty($value) ) {
+		if (empty($value)) {
 				
 			return $valid;
 			
 		}
 		
 		
-		if( strpos($value, '://') !== false ) {
+		if (strpos($value, '://') !== false) {
 			
 			// url
 			
-		} elseif( strpos($value, '//') === 0 ) {
+		} elseif (strpos($value, '//') === 0) {
 			
 			// protocol relative url
 			

includes/acf/fields/user.php

Spacing +95 added lines, -95 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_user') ) :
+if ( ! class_exists('acf_field_user')) :
 
 class acf_field_user extends acf_field {
 	
@@ -33,7 +33,7 @@ 
 		
 		// vars
 		$this->name = 'user';
-		$this->label = __("User",'acf');
+		$this->label = __("User", 'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
 			'role' 			=> '',
@@ -43,8 +43,8 @@ 
 		
 		
 		// extra
-		add_action('wp_ajax_acf/fields/user/query',			array($this, 'ajax_query'));
-		add_action('wp_ajax_nopriv_acf/fields/user/query',	array($this, 'ajax_query'));
+		add_action('wp_ajax_acf/fields/user/query', array($this, 'ajax_query'));
+		add_action('wp_ajax_nopriv_acf/fields/user/query', array($this, 'ajax_query'));
 		
 		
 		// do not delete!
@@ -66,7 +66,7 @@ 
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_choices($options = array()) {
 		
    		// defaults
    		$options = acf_parse_args($options, array(
@@ -82,9 +82,9 @@ 
    		
 		
 		// load field
-		$field = acf_get_field( $options['field_key'] );
+		$field = acf_get_field($options['field_key']);
 		
-		if( !$field ) {
+		if ( ! $field) {
 		
 			return false;
 			
@@ -94,13 +94,13 @@ 
 		// editable roles
 		$editable_roles = get_editable_roles();
 		
-		if( !empty($field['role']) ) {
+		if ( ! empty($field['role'])) {
 			
-			foreach( $editable_roles as $role => $role_info ) {
+			foreach ($editable_roles as $role => $role_info) {
 				
-				if( !in_array($role, $field['role']) ) {
+				if ( ! in_array($role, $field['role'])) {
 				
-					unset( $editable_roles[ $role ] );
+					unset($editable_roles[$role]);
 					
 				}
 				
@@ -110,10 +110,10 @@ 
 		
 				
 		// search
-		if( $options['s'] ) {
+		if ($options['s']) {
 			
 			// append to $args
-			$args['search'] = '*' . $options['s'] . '*';
+			$args['search'] = '*'.$options['s'].'*';
 			
 			
 			// add reference
@@ -127,17 +127,17 @@ 
 		
 		
 		// filters
-		$args = apply_filters("acf/fields/user/query",							$args, $field, $options['post_id']);
-		$args = apply_filters("acf/fields/user/query/name={$field['_name']}",	$args, $field, $options['post_id']);
-		$args = apply_filters("acf/fields/user/query/key={$field['key']}",		$args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query", $args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query/name={$field['_name']}", $args, $field, $options['post_id']);
+		$args = apply_filters("acf/fields/user/query/key={$field['key']}", $args, $field, $options['post_id']);
 		
 		
 		// get users
-		$users = get_users( $args );
+		$users = get_users($args);
 		
-		if( !empty($users) && !empty($editable_roles) ) {
+		if ( ! empty($users) && ! empty($editable_roles)) {
 			
-			foreach( $editable_roles as $role => $role_info ) {
+			foreach ($editable_roles as $role => $role_info) {
 				
 				// vars
 				$this_users = array();
@@ -145,16 +145,16 @@ 
 				
 				
 				// loop over users
-				foreach( array_keys($users) as $key ) {
+				foreach (array_keys($users) as $key) {
 					
-					if( in_array($role, $users[ $key ]->roles) ) {
+					if (in_array($role, $users[$key]->roles)) {
 						
 						// extract user
-						$user = acf_extract_var( $users, $key );
+						$user = acf_extract_var($users, $key);
 						
 						
 						// append to $this_users
-						$this_users[ $user->ID ] = $this->get_result( $user, $field, $options['post_id'] );
+						$this_users[$user->ID] = $this->get_result($user, $field, $options['post_id']);
 						
 					}
 					
@@ -162,7 +162,7 @@ 
 				
 				
 				// bail early if no users for this role
-				if( empty($this_users) ) {
+				if (empty($this_users)) {
 				
 					continue;
 					
@@ -170,34 +170,34 @@ 
 				
 								
 				// order by search
-				if( !empty($args['s']) ) {
+				if ( ! empty($args['s'])) {
 					
-					$this_users = acf_order_by_search( $this_users, $args['s'] );
+					$this_users = acf_order_by_search($this_users, $args['s']);
 					
 				}
 				
 				
 				// append to json
-				foreach( array_keys($this_users) as $user_id ) {
+				foreach (array_keys($this_users) as $user_id) {
 					
 					// add to json
 					$this_json[] = array(
 						'id'	=> $user_id,
-						'text'	=> $this_users[ $user_id ]
+						'text'	=> $this_users[$user_id]
 					);
 	
 				}
 				
 				
 				// add as optgroup or results
-				if( count($editable_roles) == 1 ) {
+				if (count($editable_roles) == 1) {
 				
 					$r = $this_json;
 					
 				} else {
 					
 					$r[] = array(
-						'text'		=> translate_user_role( $role_info['name'] ),
+						'text'		=> translate_user_role($role_info['name']),
 						'children'	=> $this_json
 					);
 					
@@ -230,7 +230,7 @@ 
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if ( ! acf_verify_ajax()) {
 		
 			die();
 			
@@ -238,11 +238,11 @@ 
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$choices = $this->get_choices($_POST);
 		
 		
 		// validate
-		if( !$choices ) {
+		if ( ! $choices) {
 			
 			die();
 			
@@ -250,7 +250,7 @@ 
 		
 		
 		// return JSON
-		echo json_encode( $choices );
+		echo json_encode($choices);
 		die();
 			
 	}
@@ -271,10 +271,10 @@ 
 	*  @return	(string)
 	*/
 	
-	function get_result( $user, $field, $post_id = 0 ) {
+	function get_result($user, $field, $post_id = 0) {
 		
 		// get post_id
-		if( !$post_id ) {
+		if ( ! $post_id) {
 			
 			$post_id = acf_get_setting('form_data/post_id', get_the_ID());
 			
@@ -286,13 +286,13 @@ 
 		
 		
 		// append name
-		if( $user->first_name ) {
+		if ($user->first_name) {
 			
-			$result .= ' (' .  $user->first_name;
+			$result .= ' ('.$user->first_name;
 			
-			if( $user->last_name ) {
+			if ($user->last_name) {
 				
-				$result .= ' ' . $user->last_name;
+				$result .= ' '.$user->last_name;
 				
 			}
 			
@@ -302,9 +302,9 @@ 
 		
 		
 		// filters
-		$result = apply_filters("acf/fields/user/result",							$result, $user, $field, $post_id);
-		$result = apply_filters("acf/fields/user/result/name={$field['_name']}",	$result, $user, $field, $post_id);
-		$result = apply_filters("acf/fields/user/result/key={$field['key']}",		$result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result", $result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result/name={$field['_name']}", $result, $user, $field, $post_id);
+		$result = apply_filters("acf/fields/user/result/key={$field['key']}", $result, $user, $field, $post_id);
 		
 		
 		// return
@@ -326,10 +326,10 @@ 
 	*  @return	$columns
 	*/
 	
-	function user_search_columns( $columns, $search, $WP_User_Query ) {
+	function user_search_columns($columns, $search, $WP_User_Query) {
 		
 		// bail early if no field
-		if( empty($this->field) ) {
+		if (empty($this->field)) {
 			
 			return $columns;
 			
@@ -341,9 +341,9 @@ 
 		
 		
 		// filter for 3rd party customization
-		$columns = apply_filters("acf/fields/user/search_columns", 							$columns, $search, $WP_User_Query, $field);
-		$columns = apply_filters("acf/fields/user/search_columns/name={$field['_name']}",	$columns, $search, $WP_User_Query, $field);
-		$columns = apply_filters("acf/fields/user/search_columns/key={$field['key']}",		$columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns", $columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns/name={$field['_name']}", $columns, $search, $WP_User_Query, $field);
+		$columns = apply_filters("acf/fields/user/search_columns/key={$field['key']}", $columns, $search, $WP_User_Query, $field);
 		
 		
 		// return
@@ -363,7 +363,7 @@ 
 	*  @param	$field - an array holding all the field's data
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// Change Field into a select
 		$field['type'] = 'select';
@@ -373,10 +373,10 @@ 
 		
 		
 		// populate choices
-		if( !empty($field['value']) ) {
+		if ( ! empty($field['value'])) {
 			
 			// force value to array
-			$field['value'] = acf_get_array( $field['value'] );
+			$field['value'] = acf_get_array($field['value']);
 			
 			
 			// convert values to int
@@ -388,11 +388,11 @@ 
 			));
 			
 			
-			if( !empty($users) ) {
+			if ( ! empty($users)) {
 			
-				foreach( $users as $user ) {
+				foreach ($users as $user) {
 				
-					$field['choices'][ $user->ID ] = $this->get_result( $user, $field );
+					$field['choices'][$user->ID] = $this->get_result($user, $field);
 					
 				}
 				
@@ -402,7 +402,7 @@ 
 		
 		
 		// render
-		acf_render_field( $field );
+		acf_render_field($field);
 		
 	}
 	
@@ -420,21 +420,21 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// role
 		$choices = array();
 		$editable_roles = get_editable_roles();
 
-		foreach( $editable_roles as $role => $details ) {	
+		foreach ($editable_roles as $role => $details) {	
 				
 			// only translate the output not the value
-			$choices[ $role ] = translate_user_role( $details['name'] );
+			$choices[$role] = translate_user_role($details['name']);
 			
 		}
 		
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Filter by role','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Filter by role', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'role',
@@ -442,34 +442,34 @@ 
 			'multiple'		=> 1,
 			'ui'			=> 1,
 			'allow_null'	=> 1,
-			'placeholder'	=> __("All user roles",'acf'),
+			'placeholder'	=> __("All user roles", 'acf'),
 		));
 		
 		
 		
 		// allow_null
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Allow Null?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Allow Null?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'allow_null',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
 		
 		
 		// multiple
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Select multiple values?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Select multiple values?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'multiple',
 			'choices'		=> array(
-				1				=> __("Yes",'acf'),
-				0				=> __("No",'acf'),
+				1				=> __("Yes", 'acf'),
+				0				=> __("No", 'acf'),
 			),
 			'layout'	=>	'horizontal',
 		));
@@ -494,17 +494,17 @@ 
 	*  @return	$value - the modified value
 	*/
 	
-	function update_value( $value, $post_id, $field ) {
+	function update_value($value, $post_id, $field) {
 	
 		// array?
-		if( is_array($value) && isset($value['ID']) ) {
+		if (is_array($value) && isset($value['ID'])) {
 		
 			$value = $value['ID'];	
 			
 		}
 		
 		// object?
-		if( is_object($value) && isset($value->ID) ) {
+		if (is_object($value) && isset($value->ID)) {
 		
 			$value = $value->ID;
 			
@@ -531,10 +531,10 @@ 
 	*  @return	$value
 	*/
 	
-	function load_value( $value, $post_id, $field ) {
+	function load_value($value, $post_id, $field) {
 		
 		// ACF4 null
-		if( $value === 'null' ) {
+		if ($value === 'null') {
 		
 			return false;
 			
@@ -562,10 +562,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 $value;
 			
@@ -573,7 +573,7 @@ 
 		
 		
 		// force value to array
-		$value = acf_get_array( $value );
+		$value = acf_get_array($value);
 		
 		
 		// convert values to int
@@ -581,41 +581,41 @@ 
 		
 		
 		// load users	
-		foreach( array_keys($value) as $i ) {
+		foreach (array_keys($value) as $i) {
 			
 			// vars
-			$user_id = $value[ $i ];
-			$user_data = get_userdata( $user_id );
+			$user_id = $value[$i];
+			$user_data = get_userdata($user_id);
 			
 			
 			//cope with deleted users by @adampope
-			if( !is_object($user_data) ) {
+			if ( ! is_object($user_data)) {
 			
-				unset( $value[ $i ] );
+				unset($value[$i]);
 				continue;
 				
 			}
 	
 			
 			// append to array
-			$value[ $i ] = array();
-			$value[ $i ]['ID'] = $user_id;
-			$value[ $i ]['user_firstname'] = $user_data->user_firstname;
-			$value[ $i ]['user_lastname'] = $user_data->user_lastname;
-			$value[ $i ]['nickname'] = $user_data->nickname;
-			$value[ $i ]['user_nicename'] = $user_data->user_nicename;
-			$value[ $i ]['display_name'] = $user_data->display_name;
-			$value[ $i ]['user_email'] = $user_data->user_email;
-			$value[ $i ]['user_url'] = $user_data->user_url;
-			$value[ $i ]['user_registered'] = $user_data->user_registered;
-			$value[ $i ]['user_description'] = $user_data->user_description;
-			$value[ $i ]['user_avatar'] = get_avatar( $user_id );
+			$value[$i] = array();
+			$value[$i]['ID'] = $user_id;
+			$value[$i]['user_firstname'] = $user_data->user_firstname;
+			$value[$i]['user_lastname'] = $user_data->user_lastname;
+			$value[$i]['nickname'] = $user_data->nickname;
+			$value[$i]['user_nicename'] = $user_data->user_nicename;
+			$value[$i]['display_name'] = $user_data->display_name;
+			$value[$i]['user_email'] = $user_data->user_email;
+			$value[$i]['user_url'] = $user_data->user_url;
+			$value[$i]['user_registered'] = $user_data->user_registered;
+			$value[$i]['user_description'] = $user_data->user_description;
+			$value[$i]['user_avatar'] = get_avatar($user_id);
 			
 		}
 		
 		
 		// convert back from array if neccessary
-		if( !$field['multiple'] ) {
+		if ( ! $field['multiple']) {
 		
 			$value = array_shift($value);
 			

includes/acf/fields/wysiwyg.php

Spacing +69 added lines, -69 removed lines

@@ -11,7 +11,7 @@ 
 *  @subpackage	Fields
 */
 
-if( ! class_exists('acf_field_wysiwyg') ) :
+if ( ! class_exists('acf_field_wysiwyg')) :
 
 class acf_field_wysiwyg extends acf_field {
 	
@@ -34,7 +34,7 @@ 
 		
 		// vars
 		$this->name = 'wysiwyg';
-		$this->label = __("Wysiwyg Editor",'acf');
+		$this->label = __("Wysiwyg Editor", 'acf');
 		$this->category = 'content';
 		$this->defaults = array(
 			'tabs'			=> 'all',
@@ -45,31 +45,31 @@ 
     	
     	
     	// Create an acf version of the_content filter (acf_the_content)
-		if(	!empty($GLOBALS['wp_embed']) ) {
+		if ( ! empty($GLOBALS['wp_embed'])) {
 		
-			add_filter( 'acf_the_content', array( $GLOBALS['wp_embed'], 'run_shortcode' ), 8 );
-			add_filter( 'acf_the_content', array( $GLOBALS['wp_embed'], 'autoembed' ), 8 );
+			add_filter('acf_the_content', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
+			add_filter('acf_the_content', array($GLOBALS['wp_embed'], 'autoembed'), 8);
 			
 		}
 		
-		add_filter( 'acf_the_content', 'capital_P_dangit', 11 );
-		add_filter( 'acf_the_content', 'wptexturize' );
-		add_filter( 'acf_the_content', 'convert_smilies' );
-		add_filter( 'acf_the_content', 'convert_chars' ); // not found in WP 4.4
-		add_filter( 'acf_the_content', 'wpautop' );
-		add_filter( 'acf_the_content', 'shortcode_unautop' );
+		add_filter('acf_the_content', 'capital_P_dangit', 11);
+		add_filter('acf_the_content', 'wptexturize');
+		add_filter('acf_the_content', 'convert_smilies');
+		add_filter('acf_the_content', 'convert_chars'); // not found in WP 4.4
+		add_filter('acf_the_content', 'wpautop');
+		add_filter('acf_the_content', 'shortcode_unautop');
 		//add_filter( 'acf_the_content', 'prepend_attachment' ); should only be for the_content (causes double image on attachment page)
-		if( function_exists('wp_make_content_images_responsive') ) {
+		if (function_exists('wp_make_content_images_responsive')) {
 			
-			add_filter( 'acf_the_content', 'wp_make_content_images_responsive' ); // added in WP 4.4
+			add_filter('acf_the_content', 'wp_make_content_images_responsive'); // added in WP 4.4
 			
 		}
 		
-		add_filter( 'acf_the_content', 'do_shortcode', 11);
+		add_filter('acf_the_content', 'do_shortcode', 11);
 		
 
 		// actions
-		add_action('acf/input/admin_footer_js', 	array($this, 'input_admin_footer_js'));
+		add_action('acf/input/admin_footer_js', array($this, 'input_admin_footer_js'));
 		
 		
 		// do not delete!
@@ -102,14 +102,14 @@ 
    		$editor_id = 'acf_content';
    		
    		
-   		if( version_compare($wp_version, '3.9', '>=' ) ) {
+   		if (version_compare($wp_version, '3.9', '>=')) {
    		
    			// Full
 	   		$toolbars['Full'] = array(
 	   			
-	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id),
+	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv'), $editor_id),
 	   			
-	   			2 => apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id),
+	   			2 => apply_filters('mce_buttons_2', array('formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help'), $editor_id),
 	   			
 	   			3 => apply_filters('mce_buttons_3', array(), $editor_id),
 	   			
@@ -130,9 +130,9 @@ 
 	   		// Full
 	   		$toolbars['Full'] = array(
 	   			
-	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id),
+	   			1 => apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv'), $editor_id),
 	   			
-	   			2 => apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id),
+	   			2 => apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help'), $editor_id),
 	   			
 	   			3 => apply_filters('mce_buttons_3', array(), $editor_id),
 	   			
@@ -144,7 +144,7 @@ 
 	   		// Basic
 	   		$toolbars['Basic'] = array(
 	   			
-	   			1 => apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id ),
+	   			1 => apply_filters('teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id),
 	   			
 	   		);
 	   		
@@ -152,7 +152,7 @@ 
    		
    		
    		// Filter for 3rd party
-   		$toolbars = apply_filters( 'acf/fields/wysiwyg/toolbars', $toolbars );
+   		$toolbars = apply_filters('acf/fields/wysiwyg/toolbars', $toolbars);
    		
    		
    		// return
@@ -182,7 +182,7 @@ 
 
 		
 		// bail ealry if no toolbars
-		if( empty($toolbars) ) {
+		if (empty($toolbars)) {
 			
 			return;
 			
@@ -190,23 +190,23 @@ 
 		
 			
 		// loop through toolbars
-		foreach( $toolbars as $label => $rows ) {
+		foreach ($toolbars as $label => $rows) {
 			
 			// vars
-			$label = sanitize_title( $label );
+			$label = sanitize_title($label);
 			$label = str_replace('-', '_', $label);
 			
 			
 			// append to $json
-			$json[ $label ] = array();
+			$json[$label] = array();
 			
 			
 			// convert to strings
-			if( !empty($rows) ) {
+			if ( ! empty($rows)) {
 				
-				foreach( $rows as $i => $row ) { 
+				foreach ($rows as $i => $row) { 
 					
-					$json[ $label ][ $i ] = implode(',', $row);
+					$json[$label][$i] = implode(',', $row);
 					
 				}
 				
@@ -233,7 +233,7 @@ 
 	*  @date	23/01/13
 	*/
 	
-	function render_field( $field ) {
+	function render_field($field) {
 		
 		// global
    		global $wp_version;
@@ -252,22 +252,22 @@ 
 		
 		// get height
 		$height = acf_get_user_setting('wysiwyg_height', 300);
-		$height = max( $height, 300 ); // minimum height is 300
+		$height = max($height, 300); // minimum height is 300
 		
 		
 		// detect mode
-		if( $field['tabs'] == 'visual' ) {
+		if ($field['tabs'] == 'visual') {
 			
 			// case: visual tab only
 			$default_editor = 'tinymce';
 			$show_tabs = false;
 			
-		} elseif( $field['tabs'] == 'text' ) {
+		} elseif ($field['tabs'] == 'text') {
 			
 			// case: text tab only
 			$show_tabs = false;
 			
-		} elseif( wp_default_editor() == 'tinymce' ) {
+		} elseif (wp_default_editor() == 'tinymce') {
 			
 			// case: both tabs
 			$default_editor = 'tinymce';
@@ -276,7 +276,7 @@ 
 		
 		
 		// must be logged in tp upload
-		if( !current_user_can('upload_files') ) {
+		if ( ! current_user_can('upload_files')) {
 			
 			$field['media_upload'] = 0;
 			
@@ -288,17 +288,17 @@ 
 		
 		
 		// filter value for editor
-		remove_filter( 'acf_the_editor_content', 'format_for_editor', 10, 2 );
-		remove_filter( 'acf_the_editor_content', 'wp_htmledit_pre', 10, 1 );
-		remove_filter( 'acf_the_editor_content', 'wp_richedit_pre', 10, 1 );
+		remove_filter('acf_the_editor_content', 'format_for_editor', 10, 2);
+		remove_filter('acf_the_editor_content', 'wp_htmledit_pre', 10, 1);
+		remove_filter('acf_the_editor_content', 'wp_richedit_pre', 10, 1);
 		
 		
 		// WP 4.3
-		if( version_compare($wp_version, '4.3', '>=' ) ) {
+		if (version_compare($wp_version, '4.3', '>=')) {
 			
-			add_filter( 'acf_the_editor_content', 'format_for_editor', 10, 2 );
+			add_filter('acf_the_editor_content', 'format_for_editor', 10, 2);
 			
-			$button = 'data-wp-editor-id="' . $id . '"';
+			$button = 'data-wp-editor-id="'.$id.'"';
 			
 		// WP < 4.3
 		} else {
@@ -313,25 +313,25 @@ 
 		
 		
 		// filter
-		$field['value'] = apply_filters( 'acf_the_editor_content', $field['value'], $default_editor );
+		$field['value'] = apply_filters('acf_the_editor_content', $field['value'], $default_editor);
 		
 		?>
 		<div id="wp-<?php echo $id; ?>-wrap" class="acf-editor-wrap wp-core-ui wp-editor-wrap <?php echo $switch_class; ?>" data-toolbar="<?php echo $field['toolbar']; ?>" data-upload="<?php echo $field['media_upload']; ?>">
 			<div id="wp-<?php echo $id; ?>-editor-tools" class="wp-editor-tools hide-if-no-js">
-				<?php if( $field['media_upload'] ): ?>
+				<?php if ($field['media_upload']): ?>
 				<div id="wp-<?php echo $id; ?>-media-buttons" class="wp-media-buttons">
-					<?php do_action( 'media_buttons', $id ); ?>
+					<?php do_action('media_buttons', $id); ?>
 				</div>
 				<?php endif; ?>
-				<?php if( user_can_richedit() && $show_tabs ): ?>
+				<?php if (user_can_richedit() && $show_tabs): ?>
 					<div class="wp-editor-tabs">
 						<button id="<?php echo $id; ?>-tmce" class="wp-switch-editor switch-tmce" <?php echo  $button; ?> type="button"><?php echo __('Visual', 'acf'); ?></button>
-						<button id="<?php echo $id; ?>-html" class="wp-switch-editor switch-html" <?php echo  $button; ?> type="button"><?php echo _x( 'Text', 'Name for the Text editor tab (formerly HTML)', 'acf' ); ?></button>
+						<button id="<?php echo $id; ?>-html" class="wp-switch-editor switch-html" <?php echo  $button; ?> type="button"><?php echo _x('Text', 'Name for the Text editor tab (formerly HTML)', 'acf'); ?></button>
 					</div>
 				<?php endif; ?>
 			</div>
 			<div id="wp-<?php echo $id; ?>-editor-container" class="wp-editor-container">
-				<textarea id="<?php echo $id; ?>" class="wp-editor-area" name="<?php echo $field['name']; ?>" <?php if($height): ?>style="height:<?php echo $height; ?>px;"<?php endif; ?>><?php echo $field['value']; ?></textarea>
+				<textarea id="<?php echo $id; ?>" class="wp-editor-area" name="<?php echo $field['name']; ?>" <?php if ($height): ?>style="height:<?php echo $height; ?>px;"<?php endif; ?>><?php echo $field['value']; ?></textarea>
 			</div>
 		</div>
 		<?php
@@ -352,51 +352,51 @@ 
 	*  @param	$field	- an array holding all the field's data
 	*/
 	
-	function render_field_settings( $field ) {
+	function render_field_settings($field) {
 		
 		// vars
 		$toolbars = $this->get_toolbars();
 		$choices = array();
 		
-		if( !empty($toolbars) ) {
+		if ( ! empty($toolbars)) {
 		
-			foreach( $toolbars as $k => $v ) {
+			foreach ($toolbars as $k => $v) {
 				
 				$label = $k;
-				$name = sanitize_title( $label );
+				$name = sanitize_title($label);
 				$name = str_replace('-', '_', $name);
 				
-				$choices[ $name ] = $label;
+				$choices[$name] = $label;
 			}
 		}
 		
 		
 		// default_value
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Default Value','acf'),
-			'instructions'	=> __('Appears when creating a new post','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Default Value', 'acf'),
+			'instructions'	=> __('Appears when creating a new post', 'acf'),
 			'type'			=> 'textarea',
 			'name'			=> 'default_value',
 		));
 		
 		
 		// tabs
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Tabs','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Tabs', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'tabs',
 			'choices'		=> array(
-				'all'			=>	__("Visual & Text",'acf'),
-				'visual'		=>	__("Visual Only",'acf'),
-				'text'			=>	__("Text Only",'acf'),
+				'all'			=>	__("Visual & Text", 'acf'),
+				'visual'		=>	__("Visual Only", 'acf'),
+				'text'			=>	__("Text Only", 'acf'),
 			)
 		));
 		
 		
 		// toolbar
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Toolbar','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Toolbar', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'select',
 			'name'			=> 'toolbar',
@@ -405,15 +405,15 @@ 
 		
 		
 		// media_upload
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Show Media Upload Buttons?','acf'),
+		acf_render_field_setting($field, array(
+			'label'			=> __('Show Media Upload Buttons?', 'acf'),
 			'instructions'	=> '',
 			'type'			=> 'radio',
 			'name'			=> 'media_upload',
 			'layout'		=> 'horizontal',
 			'choices'		=> array(
-				1				=>	__("Yes",'acf'),
-				0				=>	__("No",'acf'),
+				1				=>	__("Yes", 'acf'),
+				0				=>	__("No", 'acf'),
 			)
 		));
 
@@ -436,10 +436,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 $value;
 		
@@ -447,7 +447,7 @@ 
 		
 		
 		// apply filters
-		$value = apply_filters( 'acf_the_content', $value );
+		$value = apply_filters('acf_the_content', $value);
 		
 		
 		// follow the_content function in /wp-includes/post-template.php

includes/acf/forms/attachment.php

Spacing +20 added lines, -20 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_attachment') ) :
+if ( ! class_exists('acf_form_attachment')) :
 
 class acf_form_attachment {
 	
@@ -31,15 +31,15 @@ 
 	function __construct() {
 		
 		// actions
-		add_action('admin_enqueue_scripts',			array($this, 'admin_enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// render
-		add_filter('attachment_fields_to_edit', 	array($this, 'edit_attachment'), 10, 2);
+		add_filter('attachment_fields_to_edit', array($this, 'edit_attachment'), 10, 2);
 		
 		
 		// save
-		add_filter('attachment_fields_to_save', 	array($this, 'save_attachment'), 10, 2);
+		add_filter('attachment_fields_to_save', array($this, 'save_attachment'), 10, 2);
 		
 	}
 	
@@ -64,7 +64,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow === 'post.php' && $typenow === 'attachment' ) {
+		if ($pagenow === 'post.php' && $typenow === 'attachment') {
 			
 			return true;
 			
@@ -72,7 +72,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow === 'upload.php' && version_compare($wp_version, '4.0', '>=') ) {
+		if ($pagenow === 'upload.php' && version_compare($wp_version, '4.0', '>=')) {
 			
 			add_action('admin_footer', array($this, 'admin_footer'), 0);
 			
@@ -103,7 +103,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// bail early if not valid page
-		if( !$this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 			
 			return;
 			
@@ -154,7 +154,7 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function edit_attachment( $form_fields, $post ) {
+	function edit_attachment($form_fields, $post) {
 		
 		// vars
 		$el = 'tr';
@@ -165,18 +165,18 @@ 
 		
 		
 		// $el
-		if( $this->validate_page() ) {
+		if ($this->validate_page()) {
 			
 			//$el = 'div';
 			
 		}
 		
 		// get field groups
-		$field_groups = acf_get_field_groups( $args );
+		$field_groups = acf_get_field_groups($args);
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// get acf_form_data
 			ob_start();
@@ -188,7 +188,7 @@ 
 			));
 			
 			
-			if( $this->validate_page() ) {
+			if ($this->validate_page()) {
 				
 				echo '<style type="text/css">
 					.compat-attachment-fields,
@@ -223,11 +223,11 @@ 
 			//}
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
-				acf_render_fields( $post_id, $fields, $el, 'field' );
+				acf_render_fields($post_id, $fields, $el, 'field');
 				
 			}
 			
@@ -246,7 +246,7 @@ 
 			ob_end_clean();
 			
 			
-			$form_fields[ 'acf-form-data' ] = array(
+			$form_fields['acf-form-data'] = array(
 	       		'label' => '',
 	   			'input' => 'html',
 	   			'html' => $html
@@ -274,10 +274,10 @@ 
 	*  @return	$post_id (int)
 	*/
 	
-	function save_attachment( $post, $attachment ) {
+	function save_attachment($post, $attachment) {
 		
 		// bail early if not valid nonce
-		if( ! acf_verify_nonce('attachment') ) {
+		if ( ! acf_verify_nonce('attachment')) {
 		
 			return $post;
 			
@@ -285,9 +285,9 @@ 
 		
 	    
 	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
-			acf_save_post( $post['ID'] );
+			acf_save_post($post['ID']);
 			
 		}
 		

includes/acf/forms/comment.php

Spacing +24 added lines, -24 removed lines

@@ -10,7 +10,7 @@ 
 *  @subpackage	Forms
 */
 
-if( ! class_exists('acf_form_comment') ) :
+if ( ! class_exists('acf_form_comment')) :
 
 class acf_form_comment {
 	
@@ -31,17 +31,17 @@ 
 	function __construct() {
 		
 		// actions
-		add_action( 'admin_enqueue_scripts',			array( $this, 'admin_enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 		
 		
 		// render
-		add_action( 'comment_form_logged_in_after',		array( $this, 'add_comment') );
-		add_action( 'comment_form_after_fields',		array( $this, 'add_comment') );
+		add_action('comment_form_logged_in_after', array($this, 'add_comment'));
+		add_action('comment_form_after_fields', array($this, 'add_comment'));
 
 		
 		// save
-		add_action( 'edit_comment', 					array( $this, 'save_comment' ), 10, 1 );
-		add_action( 'comment_post', 					array( $this, 'save_comment' ), 10, 1 );
+		add_action('edit_comment', array($this, 'save_comment'), 10, 1);
+		add_action('comment_post', array($this, 'save_comment'), 10, 1);
 		
 	}
 	
@@ -66,7 +66,7 @@ 
 		
 		
 		// validate page
-		if( $pagenow == 'comment.php' ) {
+		if ($pagenow == 'comment.php') {
 			
 			return true;
 			
@@ -95,7 +95,7 @@ 
 	function admin_enqueue_scripts() {
 		
 		// validate page
-		if( ! $this->validate_page() ) {
+		if ( ! $this->validate_page()) {
 		
 			return;
 			
@@ -107,8 +107,8 @@ 
 		
 		
 		// actions
-		add_action('admin_footer',				array($this, 'admin_footer'), 10, 1);
-		add_action('add_meta_boxes_comment', 	array($this, 'edit_comment'), 10, 1);
+		add_action('admin_footer', array($this, 'admin_footer'), 10, 1);
+		add_action('add_meta_boxes_comment', array($this, 'edit_comment'), 10, 1);
 
 	}
 	
@@ -126,7 +126,7 @@ 
 	*  @return	n/a
 	*/
 	
-	function edit_comment( $comment ) {
+	function edit_comment($comment) {
 		
 		// vars
 		$post_id = "comment_{$comment->comment_ID}";
@@ -139,7 +139,7 @@ 
 		
 		
 		// render
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 		
 			// render post data
 			acf_form_data(array( 
@@ -148,15 +148,15 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
 				// load fields
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				
 				// vars
 				$o = array(
-					'id'			=> 'acf-' . $field_group['ID'],
+					'id'			=> 'acf-'.$field_group['ID'],
 					'key'			=> $field_group['key'],
 					'label'			=> $field_group['label_placement']
 				);
@@ -165,7 +165,7 @@ 
 				<div id="acf-<?php echo $field_group['ID']; ?>" class="stuffbox">
 					<h3 class="hndle"><?php echo $field_group['title']; ?></h3>
 					<div class="inside">
-						<?php acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] ); ?>
+						<?php acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']); ?>
 						<script type="text/javascript">
 						if( typeof acf !== 'undefined' ) {
 								
@@ -209,7 +209,7 @@ 
 		));
 		
 		
-		if( !empty($field_groups) ) {
+		if ( ! empty($field_groups)) {
 			
 			// render post data
 			acf_form_data(array( 
@@ -218,13 +218,13 @@ 
 			));
 			
 			
-			foreach( $field_groups as $field_group ) {
+			foreach ($field_groups as $field_group) {
 				
-				$fields = acf_get_fields( $field_group );
+				$fields = acf_get_fields($field_group);
 				
 				?>
 				<div class="acf-fields -<?php echo $field_group['label_placement']; ?>">
-					<?php acf_render_fields( $post_id, $fields, 'div', $field_group['instruction_placement'] ); ?>
+					<?php acf_render_fields($post_id, $fields, 'div', $field_group['instruction_placement']); ?>
 				</div>
 				<?php
 				
@@ -248,10 +248,10 @@ 
 	*  @return	n/a
 	*/
 	
-	function save_comment( $comment_id ) {
+	function save_comment($comment_id) {
 		
 		// bail early if not valid nonce
-		if( ! acf_verify_nonce('comment') ) {
+		if ( ! acf_verify_nonce('comment')) {
 		
 			return $comment_id;
 			
@@ -259,9 +259,9 @@ 
 		
 	    
 	    // validate and save
-	    if( acf_validate_save_post(true) ) {
+	    if (acf_validate_save_post(true)) {
 	    
-			acf_save_post( "comment_{$comment_id}" );	
+			acf_save_post("comment_{$comment_id}");	
 			
 		}