Completed
Pull Request — master (#115)
by Stephanie
02:51
created
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 		$field_val = '';
106 106
 		if ( is_object( $this->field ) ) {
107 107
 			$field_val = $this->field->{$column};
108
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
109
-			$field_val = $this->field[ $column ];
108
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
109
+			$field_val = $this->field[$column];
110 110
 		}
111 111
 
112 112
 		return $field_val;
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		if ( is_object( $this->field ) ) {
121 121
 			$this->field->{$column} = $value;
122 122
 		} elseif ( is_array( $this->field ) ) {
123
-			$this->field[ $column ] = $value;
123
+			$this->field[$column] = $value;
124 124
 		}
125 125
 	}
126 126
 
@@ -431,8 +431,8 @@  discard block
 block discarded – undo
431 431
 		$fields = FrmField::field_selection();
432 432
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
433 433
 
434
-		if ( isset( $fields[ $this->type ] ) ) {
435
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
434
+		if ( isset( $fields[$this->type] ) ) {
435
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
436 436
 		}
437 437
 
438 438
 		return $name;
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
 	}
444 444
 
445 445
 	public function get_default_field_options() {
446
-		$opts       = array(
446
+		$opts = array(
447 447
 			'size'               => '',
448 448
 			'max'                => '',
449 449
 			'label'              => '',
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
 			}
768 768
 		} else {
769 769
 			$args['save_array'] = $this->is_readonly_array();
770
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
770
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
771 771
 		}
772 772
 
773 773
 		return $hidden;
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
 	protected function show_single_hidden( $selected, $args ) {
777 777
 		if ( $args['save_array'] ) {
778 778
 			$args['field_name'] .= '[]';
779
-			$id                 = '';
779
+			$id = '';
780 780
 		} else {
781 781
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
782 782
 		}
@@ -792,8 +792,8 @@  discard block
 block discarded – undo
792 792
 		$selected = $values['field_value'];
793 793
 
794 794
 		if ( isset( $values['combo_name'] ) ) {
795
-			$options  = $options[ $values['combo_name'] ];
796
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
795
+			$options  = $options[$values['combo_name']];
796
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
797 797
 		}
798 798
 
799 799
 		$input = $this->select_tag( $values );
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 	}
845 845
 
846 846
 	protected function fill_display_field_values( $args = array() ) {
847
-		$defaults        = array(
847
+		$defaults = array(
848 848
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
849 849
 			'field_id'      => $this->get_field_column( 'id' ),
850 850
 			'field_plus_id' => '',
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 			$describedby = 'frm_desc_' . $args['html_id'];
883 883
 		}
884 884
 
885
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) ) {
885
+		if ( isset( $args['errors']['field' . $args['field_id']] ) ) {
886 886
 			$describedby .= ' frm_error_' . $args['html_id'];
887 887
 		}
888 888
 
@@ -938,8 +938,8 @@  discard block
 block discarded – undo
938 938
 		$value = $this->prepare_display_value( $value, $atts );
939 939
 
940 940
 		if ( is_array( $value ) ) {
941
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
942
-				$value = $value[ $atts['show'] ];
941
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
942
+				$value = $value[$atts['show']];
943 943
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
944 944
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
945 945
 				$value = implode( $sep, $value );
@@ -1008,8 +1008,8 @@  discard block
 block discarded – undo
1008 1008
 		$saved_entries = $atts['ids'];
1009 1009
 		$new_value     = array();
1010 1010
 		foreach ( (array) $value as $old_child_id ) {
1011
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1012
-				$new_value[] = $saved_entries[ $old_child_id ];
1011
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1012
+				$new_value[] = $saved_entries[$old_child_id];
1013 1013
 			}
1014 1014
 		}
1015 1015
 
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
1070 1070
 		if ( is_array( $value ) ) {
1071 1071
 			$temp_values = $value;
1072 1072
 			foreach ( $temp_values as $k => $v ) {
1073
-				$this->decode_specialchars( $value[ $k ] );
1073
+				$this->decode_specialchars( $value[$k] );
1074 1074
 			}
1075 1075
 		} else {
1076 1076
 			$value = wp_specialchars_decode( $value, ENT_COMPAT );
Please login to merge, or discard this patch.