Completed
Pull Request — trunk (#755)
by Rami
05:45
created
includes/types/CMB2_Type_File_Base.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function img_status_output( $args ) {
57 57
 		return sprintf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
58
-			$args['tag'],
59
-			$args['image'],
60
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
58
+			$args[ 'tag' ],
59
+			$args[ 'image' ],
60
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
61 61
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
62
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
62
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
63 63
 		);
64 64
 	}
65 65
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function file_status_output( $args ) {
73 73
 		return sprintf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
74
-			$args['tag'],
74
+			$args[ 'tag' ],
75 75
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
76
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
77
-			$args['value'],
76
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
77
+			$args[ 'value' ],
78 78
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
79
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
79
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
80 80
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
81
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
81
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
82 82
 		);
83 83
 	}
84 84
 
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$message = array( sprintf( esc_html__( 'Custom field types require a Type object instantiation to use this method. This method was called by the \'%s\' field type.' ), $this->field->type() ) );
172 172
 
173
-		$message[] = is_object( $this->type )
173
+		$message[ ] = is_object( $this->type )
174 174
 			? esc_html__( 'That field type may not work as expected.', 'cmb2' )
175 175
 			: esc_html__( 'That field type will not work as expected.', 'cmb2' );
176 176
 
177
-		$message[] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
177
+		$message[ ] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
178 178
 
179 179
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
180 180
 	}
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 			'class' => 'cmb2-hidden',
395 395
 		);
396 396
 		if ( $this->field->group ) {
397
-			$args['data-groupid'] = $this->field->group->id();
398
-			$args['data-iterator'] = $this->iterator;
397
+			$args[ 'data-groupid' ] = $this->field->group->id();
398
+			$args[ 'data-iterator' ] = $this->iterator;
399 399
 		}
400 400
 		return $this->input( $args );
401 401
 	}
Please login to merge, or discard this patch.
includes/CMB2_Field.php 1 patch
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -110,21 +110,21 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public function __construct( $args ) {
112 112
 
113
-		if ( ! empty( $args['group_field'] ) ) {
114
-			$this->group       = $args['group_field'];
113
+		if ( ! empty( $args[ 'group_field' ] ) ) {
114
+			$this->group       = $args[ 'group_field' ];
115 115
 			$this->object_id   = $this->group->object_id;
116 116
 			$this->object_type = $this->group->object_type;
117 117
 			$this->cmb_id      = $this->group->cmb_id;
118 118
 		} else {
119
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
120
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
119
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
120
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
121 121
 
122
-			if ( isset( $args['cmb_id'] ) ) {
123
-				$this->cmb_id = $args['cmb_id'];
122
+			if ( isset( $args[ 'cmb_id' ] ) ) {
123
+				$this->cmb_id = $args[ 'cmb_id' ];
124 124
 			}
125 125
 		}
126 126
 
127
-		$this->args = $this->_set_field_defaults( $args['field_args'], $args );
127
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args );
128 128
 
129 129
 		if ( $this->object_id ) {
130 130
 			$this->value = $this->get_data();
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 			return call_user_func_array( array( $this, 'get_string' ), $arguments );
144 144
 		}
145 145
 
146
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
146
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
147 147
 		return $this->args( $name, $key );
148 148
 	}
149 149
 
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	 */
215 215
 	public function get_data( $field_id = '', $args = array() ) {
216 216
 		if ( $field_id ) {
217
-			$args['field_id'] = $field_id;
217
+			$args[ 'field_id' ] = $field_id;
218 218
 		} else if ( $this->group ) {
219
-			$args['field_id'] = $this->group->id();
219
+			$args[ 'field_id' ] = $this->group->id();
220 220
 		}
221 221
 
222 222
 		$a = $this->data_args( $args );
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
 		 *
258 258
 		 * @since 2.0.0
259 259
 		 */
260
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
260
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
261 261
 
262 262
 		// If no override, get value normally
263 263
 		if ( 'cmb2_field_no_override_val' === $data ) {
264
-			$data = 'options-page' === $a['type']
265
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
266
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
264
+			$data = 'options-page' === $a[ 'type' ]
265
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
266
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
267 267
 		}
268 268
 
269 269
 		if ( $this->group ) {
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 	public function update_data( $new_value, $single = true ) {
286 286
 		$a = $this->data_args( array( 'single' => $single ) );
287 287
 
288
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
288
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
289 289
 
290 290
 		/**
291 291
 		 * Filter whether to override saving of meta value.
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 		 *
322 322
 		 * @since 2.0.0
323 323
 		 */
324
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
324
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
325 325
 
326 326
 		// If override, return that
327 327
 		if ( null !== $override ) {
@@ -329,22 +329,22 @@  discard block
 block discarded – undo
329 329
 		}
330 330
 
331 331
 		// Options page handling (or temp data store)
332
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
333
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
332
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
333
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
334 334
 		}
335 335
 
336 336
 		// Add metadata if not single
337
-		if ( ! $a['single'] ) {
338
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
337
+		if ( ! $a[ 'single' ] ) {
338
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
339 339
 		}
340 340
 
341 341
 		// Delete meta if we have an empty array
342
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
343
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
342
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
343
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
344 344
 		}
345 345
 
346 346
 		// Update metadata
347
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
347
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
348 348
 	}
349 349
 
350 350
 	/**
@@ -394,19 +394,19 @@  discard block
 block discarded – undo
394 394
 		 * @param array $field_args All field arguments
395 395
 		 * @param CMB2_Field object $field This field object
396 396
 		 */
397
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
397
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
398 398
 
399 399
 		// If no override, remove as usual
400 400
 		if ( null !== $override ) {
401 401
 			return $override;
402 402
 		}
403 403
 		// Option page handling
404
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
405
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
404
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
405
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
406 406
 		}
407 407
 
408 408
 		// Remove metadata
409
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
409
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
410 410
 	}
411 411
 
412 412
 	/**
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
 
859 859
 		foreach ( $conditional_classes as $class => $condition ) {
860 860
 			if ( $condition ) {
861
-				$classes[] = $class;
861
+				$classes[ ] = $class;
862 862
 			}
863 863
 		}
864 864
 
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 		}
870 870
 
871 871
 		if ( $added_classes ) {
872
-			$classes[] = esc_attr( $added_classes );
872
+			$classes[ ] = esc_attr( $added_classes );
873 873
 		}
874 874
 
875 875
 		/**
@@ -969,10 +969,10 @@  discard block
 block discarded – undo
969 969
 	public function get_string( $text_key, $fallback ) {
970 970
 		// If null, populate with our field strings values.
971 971
 		if ( null === $this->strings ) {
972
-			$this->strings = (array) $this->args['text'];
972
+			$this->strings = (array) $this->args[ 'text' ];
973 973
 
974
-			if ( is_callable( $this->args['text_cb'] ) ) {
975
-				$strings = call_user_func( $this->args['text_cb'], $this );
974
+			if ( is_callable( $this->args[ 'text_cb' ] ) ) {
975
+				$strings = call_user_func( $this->args[ 'text_cb' ], $this );
976 976
 
977 977
 				if ( $strings && is_array( $strings ) ) {
978 978
 					$this->strings += $strings;
@@ -1006,10 +1006,10 @@  discard block
 block discarded – undo
1006 1006
 			return $this->field_options;
1007 1007
 		}
1008 1008
 
1009
-		$this->field_options = (array) $this->args['options'];
1009
+		$this->field_options = (array) $this->args[ 'options' ];
1010 1010
 
1011
-		if ( is_callable( $this->args['options_cb'] ) ) {
1012
-			$options = call_user_func( $this->args['options_cb'], $this );
1011
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
1012
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
1013 1013
 
1014 1014
 			if ( $options && is_array( $options ) ) {
1015 1015
 				$this->field_options = $options + $this->field_options;
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
 	 */
1031 1031
 	public function add_js_dependencies( $dependencies = array() ) {
1032 1032
 		foreach ( (array) $dependencies as $dependency ) {
1033
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
1033
+			$this->args[ 'js_dependencies' ][ $dependency ] = $dependency;
1034 1034
 		}
1035 1035
 
1036 1036
 		CMB2_JS::add_dependencies( $dependencies );
@@ -1044,17 +1044,17 @@  discard block
 block discarded – undo
1044 1044
 	 * @return mixed  Default field value
1045 1045
 	 */
1046 1046
 	public function get_default() {
1047
-		if ( null !== $this->args['default'] ) {
1048
-			return $this->args['default'];
1047
+		if ( null !== $this->args[ 'default' ] ) {
1048
+			return $this->args[ 'default' ];
1049 1049
 		}
1050 1050
 
1051
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
1051
+		$param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default';
1052 1052
 		$default = $this->get_param_callback_result( $param );
1053 1053
 
1054 1054
 		// Allow a filter override of the default value
1055
-		$this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this );
1055
+		$this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this );
1056 1056
 
1057
-		return $this->args['default'];
1057
+		return $this->args[ 'default' ];
1058 1058
 	}
1059 1059
 
1060 1060
 	/**
@@ -1084,18 +1084,18 @@  discard block
 block discarded – undo
1084 1084
 			'classes_cb'        => '',
1085 1085
 			'select_all_button' => true,
1086 1086
 			'multiple'          => false,
1087
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
1087
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
1088 1088
 			'inline'            => false,
1089 1089
 			'on_front'          => true,
1090 1090
 			'show_names'        => true,
1091 1091
 			'save_field'        => true, // Will not save if false
1092 1092
 			'date_format'       => 'm\/d\/Y',
1093 1093
 			'time_format'       => 'h:i A',
1094
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
1095
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
1094
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
1095
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
1096 1096
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
1097 1097
 			'display_cb'        => array( $this, 'display_value_callback' ),
1098
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
1098
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
1099 1099
 			'column'            => false,
1100 1100
 			'js_dependencies'   => array(),
1101 1101
 		) );
@@ -1109,44 +1109,44 @@  discard block
 block discarded – undo
1109 1109
 		 */
1110 1110
 		$args = $this->convert_deprecated_params( $args );
1111 1111
 
1112
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
1113
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
1112
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
1113
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
1114 1114
 
1115
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
1115
+		$args[ 'options' ]    = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
1116 1116
 			'add_button'    => esc_html__( 'Add Group', 'cmb2' ),
1117 1117
 			'remove_button' => esc_html__( 'Remove Group', 'cmb2' ),
1118
-		) ) : $args['options'];
1118
+		) ) : $args[ 'options' ];
1119 1119
 
1120
-		$args['_id']        = $args['id'];
1121
-		$args['_name']      = $args['id'];
1120
+		$args[ '_id' ]        = $args[ 'id' ];
1121
+		$args[ '_name' ]      = $args[ 'id' ];
1122 1122
 
1123 1123
 		if ( $this->group ) {
1124 1124
 
1125
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
1126
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
1125
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
1126
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
1127 1127
 		}
1128 1128
 
1129
-		if ( 'wysiwyg' == $args['type'] ) {
1130
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
1131
-			$args['options']['textarea_name'] = $args['_name'];
1129
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
1130
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
1131
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
1132 1132
 		}
1133 1133
 
1134 1134
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
1135 1135
 
1136
-		if ( in_array( $args['type'], $option_types, true ) ) {
1136
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
1137 1137
 
1138
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
1139
-			$args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none'];
1138
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
1139
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? esc_html__( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
1140 1140
 
1141
-			if ( null === $args['show_option_none'] ) {
1142
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
1143
-				$args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
1141
+			if ( null === $args[ 'show_option_none' ] ) {
1142
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
1143
+				$args[ 'show_option_none' ] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
1144 1144
 			}
1145 1145
 
1146 1146
 		}
1147 1147
 
1148
-		$args['has_supporting_data'] = in_array(
1149
-			$args['type'],
1148
+		$args[ 'has_supporting_data' ] = in_array(
1149
+			$args[ 'type' ],
1150 1150
 			array(
1151 1151
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
1152 1152
 				'file',
@@ -1169,10 +1169,10 @@  discard block
 block discarded – undo
1169 1169
 	protected function get_default_args( $field_args, $field_group = null ) {
1170 1170
 		$args = parent::get_default_args( array(), $this->group );
1171 1171
 
1172
-		if ( isset( $field_args['field_args'] ) ) {
1172
+		if ( isset( $field_args[ 'field_args' ] ) ) {
1173 1173
 			$args = wp_parse_args( $field_args, $args );
1174 1174
 		} else {
1175
-			$args['field_args'] = wp_parse_args( $field_args, $this->args );
1175
+			$args[ 'field_args' ] = wp_parse_args( $field_args, $this->args );
1176 1176
 		}
1177 1177
 
1178 1178
 		return $args;
@@ -1215,43 +1215,43 @@  discard block
 block discarded – undo
1215 1215
 	 */
1216 1216
 	protected function convert_deprecated_params( $args ) {
1217 1217
 
1218
-		if ( isset( $args['row_classes'] ) ) {
1218
+		if ( isset( $args[ 'row_classes' ] ) ) {
1219 1219
 
1220 1220
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_PARAM, 'row_classes', 'classes' );
1221 1221
 
1222 1222
 			// row_classes param could be a callback
1223
-			if ( is_callable( $args['row_classes'] ) ) {
1223
+			if ( is_callable( $args[ 'row_classes' ] ) ) {
1224 1224
 
1225 1225
 				$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'row_classes', 'classes_cb' );
1226 1226
 
1227
-				$args['classes_cb'] = $args['row_classes'];
1228
-				$args['classes'] = null;
1227
+				$args[ 'classes_cb' ] = $args[ 'row_classes' ];
1228
+				$args[ 'classes' ] = null;
1229 1229
 			} else {
1230 1230
 
1231 1231
 
1232
-				$args['classes'] = $args['row_classes'];
1232
+				$args[ 'classes' ] = $args[ 'row_classes' ];
1233 1233
 			}
1234 1234
 
1235
-			unset( $args['row_classes'] );
1235
+			unset( $args[ 'row_classes' ] );
1236 1236
 		}
1237 1237
 
1238 1238
 
1239 1239
 		// default param can be passed a callback as well
1240
-		if ( is_callable( $args['default'] ) ) {
1240
+		if ( is_callable( $args[ 'default' ] ) ) {
1241 1241
 
1242 1242
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'default', 'default_cb' );
1243 1243
 
1244
-			$args['default_cb'] = $args['default'];
1245
-			$args['default'] = null;
1244
+			$args[ 'default_cb' ] = $args[ 'default' ];
1245
+			$args[ 'default' ] = null;
1246 1246
 		}
1247 1247
 
1248 1248
 		// options param can be passed a callback as well
1249
-		if ( is_callable( $args['options'] ) ) {
1249
+		if ( is_callable( $args[ 'options' ] ) ) {
1250 1250
 
1251 1251
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'options', 'options_cb' );
1252 1252
 
1253
-			$args['options_cb'] = $args['options'];
1254
-			$args['options'] = array();
1253
+			$args[ 'options_cb' ] = $args[ 'options' ];
1254
+			$args[ 'options' ] = array();
1255 1255
 		}
1256 1256
 
1257 1257
 		return $args;
Please login to merge, or discard this patch.
includes/CMB2_Base.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -335,11 +335,11 @@  discard block
 block discarded – undo
335 335
 			switch ( $message ) {
336 336
 
337 337
 				case self::DEPRECATED_PARAM:
338
-					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
338
+					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
339 339
 					break;
340 340
 
341 341
 				case self::DEPRECATED_CB_PARAM:
342
-					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
342
+					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
343 343
 					break;
344 344
 
345 345
 				default:
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	public function __call( $method, $args ) {
419 419
 		$object_class = strtolower( get_class( $this ) );
420 420
 
421
-		if ( ! has_filter(  "{$object_class}_inherit_{$method}" ) ) {
421
+		if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) {
422 422
 			throw new Exception( 'Invalid ' . get_class( $this ) . ' method: ' . $method );
423 423
 		}
424 424
 
Please login to merge, or discard this patch.
includes/CMB2.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -113,19 +113,19 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function __construct( $config, $object_id = 0 ) {
115 115
 
116
-		if ( empty( $config['id'] ) ) {
116
+		if ( empty( $config[ 'id' ] ) ) {
117 117
 			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
118 118
 		}
119 119
 
120 120
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
121
-		$this->meta_box['fields'] = array();
121
+		$this->meta_box[ 'fields' ] = array();
122 122
 
123 123
 		$this->object_id( $object_id );
124 124
 		$this->mb_object_type();
125
-		$this->cmb_id = $config['id'];
125
+		$this->cmb_id = $config[ 'id' ];
126 126
 
127
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
128
-			$this->add_fields( $config['fields'] );
127
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
128
+			$this->add_fields( $config[ 'fields' ] );
129 129
 		}
130 130
 
131 131
 		CMB2_Boxes::add( $this );
@@ -294,22 +294,22 @@  discard block
 block discarded – undo
294 294
 	 * @return mixed CMB2_Field object if successful.
295 295
 	 */
296 296
 	public function render_field( $field_args ) {
297
-		$field_args['context'] = $this->prop( 'context' );
297
+		$field_args[ 'context' ] = $this->prop( 'context' );
298 298
 
299
-		if ( 'group' == $field_args['type'] ) {
299
+		if ( 'group' == $field_args[ 'type' ] ) {
300 300
 
301
-			if ( ! isset( $field_args['show_names'] ) ) {
302
-				$field_args['show_names'] = $this->prop( 'show_names' );
301
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
302
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
303 303
 			}
304 304
 			$field = $this->render_group( $field_args );
305 305
 
306
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
306
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
307 307
 			// Save rendering for after the metabox
308 308
 			$field = $this->add_hidden_field( $field_args );
309 309
 
310 310
 		} else {
311 311
 
312
-			$field_args['show_names'] = $this->prop( 'show_names' );
312
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
313 313
 
314 314
 			// Render default fields
315 315
 			$field = $this->get_field( $field_args )->render_field();
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	public function render_group( $args ) {
327 327
 
328
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
328
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
329 329
 			return;
330 330
 		}
331 331
 
@@ -435,15 +435,15 @@  discard block
 block discarded – undo
435 435
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
436 436
 				// Loop and render repeatable group fields
437 437
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
438
-					if ( 'hidden' == $field_args['type'] ) {
438
+					if ( 'hidden' == $field_args[ 'type' ] ) {
439 439
 
440 440
 						// Save rendering for after the metabox
441 441
 						$this->add_hidden_field( $field_args, $field_group );
442 442
 
443 443
 					} else {
444 444
 
445
-						$field_args['show_names'] = $field_group->args( 'show_names' );
446
-						$field_args['context']    = $field_group->args( 'context' );
445
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
446
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
447 447
 
448 448
 						$field = $this->get_field( $field_args, $field_group )->render_field();
449 449
 					}
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
472 472
 	 */
473 473
 	public function add_hidden_field( $field_args, $field_group = null ) {
474
-		if ( isset( $field_args['field_args'] ) ) {
474
+		if ( isset( $field_args[ 'field_args' ] ) ) {
475 475
 			// For back-compatibility.
476 476
 			$field = new CMB2_Field( $field_args );
477 477
 		} else {
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 			$type->iterator = $field_group->index;
485 485
 		}
486 486
 
487
-		$this->hidden_fields[] = $type;
487
+		$this->hidden_fields[ ] = $type;
488 488
 
489 489
 		return $field;
490 490
 	}
@@ -581,11 +581,11 @@  discard block
 block discarded – undo
581 581
 	 */
582 582
 	public function process_field( $field_args ) {
583 583
 
584
-		switch ( $field_args['type'] ) {
584
+		switch ( $field_args[ 'type' ] ) {
585 585
 
586 586
 			case 'group':
587 587
 				if ( $this->save_group( $field_args ) ) {
588
-					$this->updated[] = $field_args['id'];
588
+					$this->updated[ ] = $field_args[ 'id' ];
589 589
 				}
590 590
 
591 591
 				break;
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
 				$field = $this->get_new_field( $field_args );
600 600
 
601 601
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
602
-					$this->updated[] = $field->id();
602
+					$this->updated[ ] = $field->id();
603 603
 				}
604 604
 
605 605
 				break;
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 	 * @return mixed        Return of CMB2_Field::update_data()
667 667
 	 */
668 668
 	public function save_group( $args ) {
669
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
669
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
670 670
 			return;
671 671
 		}
672 672
 
@@ -714,16 +714,16 @@  discard block
 block discarded – undo
714 714
 						$_new_val = array();
715 715
 						foreach ( $new_val as $group_index => $grouped_data ) {
716 716
 							// Add the supporting data to the $saved array stack
717
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
717
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
718 718
 							// Reset var to the actual value
719
-							$_new_val[ $group_index ] = $grouped_data['value'];
719
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
720 720
 						}
721 721
 						$new_val = $_new_val;
722 722
 					} else {
723 723
 						// Add the supporting data to the $saved array stack
724
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
724
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
725 725
 						// Reset var to the actual value
726
-						$new_val = $new_val['value'];
726
+						$new_val = $new_val[ 'value' ];
727 727
 					}
728 728
 				}
729 729
 
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 
738 738
 				// Compare values and add to `$updated` array
739 739
 				if ( $is_updated || $is_removed ) {
740
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
740
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
741 741
 				}
742 742
 
743 743
 				// Add to `$saved` array
@@ -774,22 +774,22 @@  discard block
 block discarded – undo
774 774
 		// Try to get our object ID from the global space
775 775
 		switch ( $this->object_type() ) {
776 776
 			case 'user':
777
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
778
-				$object_id = ! $object_id && 'user-new.php' != $screen->parent_file && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
777
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
778
+				$object_id = ! $object_id && 'user-new.php' != $screen->parent_file && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
779 779
 				break;
780 780
 
781 781
 			case 'comment':
782
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
783
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
782
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
783
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
784 784
 				break;
785 785
 
786 786
 			case 'term':
787
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
787
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
788 788
 				break;
789 789
 
790 790
 			default:
791
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
792
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
791
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
792
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
793 793
 				break;
794 794
 		}
795 795
 
@@ -865,7 +865,7 @@  discard block
 block discarded – undo
865 865
 	 * @return boolean True/False
866 866
 	 */
867 867
 	public function is_options_page_mb() {
868
-		return ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] || array_key_exists( 'options-page', $this->meta_box['show_on'] ) );
868
+		return ( isset( $this->meta_box[ 'show_on' ][ 'key' ] ) && 'options-page' === $this->meta_box[ 'show_on' ][ 'key' ] || array_key_exists( 'options-page', $this->meta_box[ 'show_on' ] ) );
869 869
 	}
870 870
 
871 871
 	/**
@@ -952,7 +952,7 @@  discard block
 block discarded – undo
952 952
 			return $field;
953 953
 		}
954 954
 
955
-		$field_id = is_string( $field ) ? $field : $field['id'];
955
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
956 956
 
957 957
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
958 958
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -988,16 +988,16 @@  discard block
 block discarded – undo
988 988
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
989 989
 
990 990
 			// Update the fields array w/ any modified properties inherited from the group field
991
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
991
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
992 992
 
993 993
 			return $this->get_default_args( $field_args, $field_group );
994 994
 		}
995 995
 
996 996
 		if ( is_array( $field_args ) ) {
997
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
997
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
998 998
 		}
999 999
 
1000
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
1000
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
1001 1001
 	}
1002 1002
 
1003 1003
 	/**
@@ -1047,8 +1047,8 @@  discard block
 block discarded – undo
1047 1047
 
1048 1048
 			$sub_fields = false;
1049 1049
 			if ( array_key_exists( 'fields', $field ) ) {
1050
-				$sub_fields = $field['fields'];
1051
-				unset( $field['fields'] );
1050
+				$sub_fields = $field[ 'fields' ];
1051
+				unset( $field[ 'fields' ] );
1052 1052
 			}
1053 1053
 
1054 1054
 			$field_id = $parent_field_id
@@ -1073,26 +1073,26 @@  discard block
 block discarded – undo
1073 1073
 			return false;
1074 1074
 		}
1075 1075
 
1076
-		if ( 'oembed' === $field['type'] ) {
1076
+		if ( 'oembed' === $field[ 'type' ] ) {
1077 1077
 			// Initiate oembed Ajax hooks
1078 1078
 			cmb2_ajax();
1079 1079
 		}
1080 1080
 
1081
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
1081
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
1082 1082
 			$field = $this->define_field_column( $field );
1083 1083
 		}
1084 1084
 
1085
-		if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
1086
-			$this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
1085
+		if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) {
1086
+			$this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ];
1087 1087
 		}
1088 1088
 
1089 1089
 		$this->_add_field_to_array(
1090 1090
 			$field,
1091
-			$this->meta_box['fields'],
1091
+			$this->meta_box[ 'fields' ],
1092 1092
 			$position
1093 1093
 		);
1094 1094
 
1095
-		return $field['id'];
1095
+		return $field[ 'id' ];
1096 1096
 	}
1097 1097
 
1098 1098
 	/**
@@ -1104,10 +1104,10 @@  discard block
 block discarded – undo
1104 1104
 	protected function define_field_column( array $field ) {
1105 1105
 		$this->has_columns = true;
1106 1106
 
1107
-		$column = is_array( $field['column'] ) ? $field['column'] : array();
1107
+		$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
1108 1108
 
1109
-		$field['column'] = wp_parse_args( $column, array(
1110
-			'name'     => isset( $field['name'] ) ? $field['name'] : '',
1109
+		$field[ 'column' ] = wp_parse_args( $column, array(
1110
+			'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
1111 1111
 			'position' => false,
1112 1112
 		) );
1113 1113
 
@@ -1123,27 +1123,27 @@  discard block
 block discarded – undo
1123 1123
 	 * @return mixed                   Array of parent/field ids or false
1124 1124
 	 */
1125 1125
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
1126
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
1126
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
1127 1127
 			return false;
1128 1128
 		}
1129 1129
 
1130
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
1130
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
1131 1131
 
1132
-		if ( 'group' !== $parent_field['type'] ) {
1132
+		if ( 'group' !== $parent_field[ 'type' ] ) {
1133 1133
 			return false;
1134 1134
 		}
1135 1135
 
1136
-		if ( ! isset( $parent_field['fields'] ) ) {
1137
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
1136
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
1137
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
1138 1138
 		}
1139 1139
 
1140 1140
 		$this->_add_field_to_array(
1141 1141
 			$field,
1142
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
1142
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
1143 1143
 			$position
1144 1144
 		);
1145 1145
 
1146
-		return array( $parent_field_id, $field['id'] );
1146
+		return array( $parent_field_id, $field[ 'id' ] );
1147 1147
 	}
1148 1148
 
1149 1149
 	/**
@@ -1155,9 +1155,9 @@  discard block
 block discarded – undo
1155 1155
 	 */
1156 1156
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
1157 1157
 		if ( $position ) {
1158
-			CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
1158
+			CMB2_Utils::array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
1159 1159
 		} else {
1160
-			$fields[ $field['id'] ] = $field;
1160
+			$fields[ $field[ 'id' ] ] = $field;
1161 1161
 		}
1162 1162
 	}
1163 1163
 
@@ -1180,15 +1180,15 @@  discard block
 block discarded – undo
1180 1180
 		unset( $this->fields[ implode( '', $ids ) ] );
1181 1181
 
1182 1182
 		if ( ! $sub_field_id ) {
1183
-			unset( $this->meta_box['fields'][ $field_id ] );
1183
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1184 1184
 			return true;
1185 1185
 		}
1186 1186
 
1187
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1188
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1187
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1188
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1189 1189
 		}
1190
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1191
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1190
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1191
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1192 1192
 		}
1193 1193
 		return true;
1194 1194
 	}
@@ -1212,11 +1212,11 @@  discard block
 block discarded – undo
1212 1212
 		list( $field_id, $sub_field_id ) = $ids;
1213 1213
 
1214 1214
 		if ( ! $sub_field_id ) {
1215
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1215
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1216 1216
 			return $field_id;
1217 1217
 		}
1218 1218
 
1219
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1219
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1220 1220
 		return $field_id;
1221 1221
 	}
1222 1222
 
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1231 1231
 		$sub_field_id = $parent_field_id ? $field_id : '';
1232 1232
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1233
-		$fields       =& $this->meta_box['fields'];
1233
+		$fields       = & $this->meta_box[ 'fields' ];
1234 1234
 
1235 1235
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1236 1236
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1244,12 +1244,12 @@  discard block
 block discarded – undo
1244 1244
 			return array( $field_id, $sub_field_id );
1245 1245
 		}
1246 1246
 
1247
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1247
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1248 1248
 			return false;
1249 1249
 		}
1250 1250
 
1251
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1252
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1251
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1252
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1253 1253
 		}
1254 1254
 
1255 1255
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
Please login to merge, or discard this patch.