Completed
Pull Request — trunk (#541)
by Justin
20:13 queued 05:52
created
includes/CMB2_REST_Access.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 
89 89
 	protected function prepare_read_write_fields() {
90 90
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
91
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
91
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
92 92
 
93 93
 			if ( false === $show_in_rest ) {
94 94
 				continue;
95 95
 			}
96 96
 
97
-			$this->maybe_add_read_field( $field['id'], $show_in_rest );
98
-			$this->maybe_add_write_field( $field['id'], $show_in_rest );
97
+			$this->maybe_add_read_field( $field[ 'id' ], $show_in_rest );
98
+			$this->maybe_add_write_field( $field[ 'id' ], $show_in_rest );
99 99
 		}
100 100
 	}
101 101
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			: in_array( $show_in_rest, array( 'read_and_write', 'read_only' ), true );
106 106
 
107 107
 		if ( $can_read ) {
108
-			self::$read_fields[ $this->cmb->cmb_id ][] = $field_id;
108
+			self::$read_fields[ $this->cmb->cmb_id ][ ] = $field_id;
109 109
 		}
110 110
 	}
111 111
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			: in_array( $show_in_rest, array( 'read_and_write', 'write_only' ), true );
116 116
 
117 117
 		if ( $can_update ) {
118
-			self::$write_fields[ $this->cmb->cmb_id ][] = $field_id;
118
+			self::$write_fields[ $this->cmb->cmb_id ][ ] = $field_id;
119 119
 		}
120 120
 	}
121 121
 
@@ -129,14 +129,14 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	public static function get_restable_field_values( $object, $field_id, $request ) {
131 131
 		$values = array();
132
-		if ( ! isset( $object['id'] ) ) {
132
+		if ( ! isset( $object[ 'id' ] ) ) {
133 133
 			return;
134 134
 		}
135 135
 
136 136
 		foreach ( self::$read_fields as $cmb_id => $fields ) {
137 137
 			foreach ( $fields as $field_id ) {
138 138
 				$field = self::$boxes[ $cmb_id ]->get_field( $field_id );
139
-				$field->object_id = $object['id'];
139
+				$field->object_id = $object[ 'id' ];
140 140
 
141 141
 				if ( isset( $object->type ) ) {
142 142
 					$field->object_type = $object->type;
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 			return;
168 168
 		}
169 169
 
170
-		$object_id   = $data['object_id'];
171
-		$object_type = $data['object_type'];
170
+		$object_id   = $data[ 'object_id' ];
171
+		$object_type = $data[ 'object_type' ];
172 172
 		$updated     = array();
173 173
 
174 174
 		foreach ( self::$write_fields as $cmb_id => $fields ) {
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
252 252
 		} elseif ( isset( $object->comment_ID ) ) {
253 253
 			$object_id   = intval( $object->comment_ID );
254 254
 			$object_type = 'comment';
255
-		} elseif ( is_array( $object ) && isset( $object['term_id'] ) ) {
256
-			$object_id   = intval( $object['term_id'] );
255
+		} elseif ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
256
+			$object_id   = intval( $object[ 'term_id' ] );
257 257
 			$object_type = 'term';
258 258
 		} elseif ( isset( $object->term_id ) ) {
259 259
 			$object_id   = intval( $object->term_id );
Please login to merge, or discard this patch.
includes/CMB2_hookup.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 * @return array           Modified array of classes
258 258
 	 */
259 259
 	public function close_metabox_class( $classes ) {
260
-		$classes[] = 'closed';
260
+		$classes[ ] = 'closed';
261 261
 		return $classes;
262 262
 	}
263 263
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	public function user_new_metabox( $section ) {
278 278
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
279 279
 			$object_id = $this->cmb->object_id();
280
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
280
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
281 281
 			$this->user_metabox();
282 282
 		}
283 283
 	}
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
429 429
 
430 430
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
431
-				$data_to_delete[ $field['id'] ] = '';
431
+				$data_to_delete[ $field[ 'id' ] ] = '';
432 432
 			}
433 433
 
434 434
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
Please login to merge, or discard this patch.
includes/CMB2_Field.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -117,16 +117,16 @@  discard block
 block discarded – undo
117 117
 	 */
118 118
 	public function __construct( $args ) {
119 119
 
120
-		if ( ! empty( $args['group_field'] ) ) {
121
-			$this->group       = $args['group_field'];
120
+		if ( ! empty( $args[ 'group_field' ] ) ) {
121
+			$this->group       = $args[ 'group_field' ];
122 122
 			$this->object_id   = $this->group->object_id;
123 123
 			$this->object_type = $this->group->object_type;
124 124
 		} else {
125
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
126
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
125
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
126
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
127 127
 		}
128 128
 
129
-		$this->args = $this->_set_field_defaults( $args['field_args'] );
129
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ] );
130 130
 
131 131
 		if ( $this->object_id ) {
132 132
 			$this->value = $this->get_data();
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @return mixed             Value of field argument
142 142
 	 */
143 143
 	public function __call( $name, $arguments ) {
144
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
144
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
145 145
 		return $this->args( $name, $key );
146 146
 	}
147 147
 
@@ -212,9 +212,9 @@  discard block
 block discarded – undo
212 212
 	 */
213 213
 	public function get_data( $field_id = '', $args = array() ) {
214 214
 		if ( $field_id ) {
215
-			$args['field_id'] = $field_id;
215
+			$args[ 'field_id' ] = $field_id;
216 216
 		} else if ( $this->group ) {
217
-			$args['field_id'] = $this->group->id();
217
+			$args[ 'field_id' ] = $this->group->id();
218 218
 		}
219 219
 
220 220
 		$a = $this->data_args( $args );
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 		 *
256 256
 		 * @since 2.0.0
257 257
 		 */
258
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
258
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
259 259
 
260 260
 		// If no override, get value normally
261 261
 		if ( 'cmb2_field_no_override_val' === $data ) {
262
-			$data = 'options-page' === $a['type']
263
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
264
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
262
+			$data = 'options-page' === $a[ 'type' ]
263
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
264
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
265 265
 		}
266 266
 
267 267
 		if ( $this->group ) {
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 	public function update_data( $new_value, $single = true ) {
284 284
 		$a = $this->data_args( array( 'single' => $single ) );
285 285
 
286
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
286
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
287 287
 
288 288
 		/**
289 289
 		 * Filter whether to override saving of meta value.
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 		 *
320 320
 		 * @since 2.0.0
321 321
 		 */
322
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
322
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
323 323
 
324 324
 		// If override, return that
325 325
 		if ( null !== $override ) {
@@ -327,22 +327,22 @@  discard block
 block discarded – undo
327 327
 		}
328 328
 
329 329
 		// Options page handling (or temp data store)
330
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
331
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
330
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
331
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
332 332
 		}
333 333
 
334 334
 		// Add metadata if not single
335
-		if ( ! $a['single'] ) {
336
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
335
+		if ( ! $a[ 'single' ] ) {
336
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
337 337
 		}
338 338
 
339 339
 		// Delete meta if we have an empty array
340
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
341
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
340
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
341
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
342 342
 		}
343 343
 
344 344
 		// Update metadata
345
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
345
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
346 346
 	}
347 347
 
348 348
 	/**
@@ -392,19 +392,19 @@  discard block
 block discarded – undo
392 392
 		 * @param array $field_args All field arguments
393 393
 		 * @param CMB2_Field object $field This field object
394 394
 		 */
395
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
395
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
396 396
 
397 397
 		// If no override, remove as usual
398 398
 		if ( null !== $override ) {
399 399
 			return $override;
400 400
 		}
401 401
 		// Option page handling
402
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
403
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
402
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
403
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
404 404
 		}
405 405
 
406 406
 		// Remove metadata
407
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
407
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
408 408
 	}
409 409
 
410 410
 	/**
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 
877 877
 		foreach ( $conditional_classes as $class => $condition ) {
878 878
 			if ( $condition ) {
879
-				$classes[] = $class;
879
+				$classes[ ] = $class;
880 880
 			}
881 881
 		}
882 882
 
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 		}
886 886
 
887 887
 		if ( $added_classes ) {
888
-			$classes[] = esc_attr( $added_classes );
888
+			$classes[ ] = esc_attr( $added_classes );
889 889
 		}
890 890
 
891 891
 		/**
@@ -990,10 +990,10 @@  discard block
 block discarded – undo
990 990
 			return $this->field_options;
991 991
 		}
992 992
 
993
-		$this->field_options = (array) $this->args['options'];
993
+		$this->field_options = (array) $this->args[ 'options' ];
994 994
 
995
-		if ( is_callable( $this->args['options_cb'] ) ) {
996
-			$options = call_user_func( $this->args['options_cb'], $this );
995
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
996
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
997 997
 
998 998
 			if ( $options && is_array( $options ) ) {
999 999
 				$this->field_options += $options;
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 	 */
1015 1015
 	public function add_js_dependencies( $dependencies = array() ) {
1016 1016
 		foreach ( (array) $dependencies as $dependency ) {
1017
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
1017
+			$this->args[ 'js_dependencies' ][ $dependency ] = $dependency;
1018 1018
 		}
1019 1019
 
1020 1020
 		CMB2_JS::add_dependencies( $dependencies );
@@ -1041,66 +1041,66 @@  discard block
 block discarded – undo
1041 1041
 			'default'           => null,
1042 1042
 			'select_all_button' => true,
1043 1043
 			'multiple'          => false,
1044
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
1044
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
1045 1045
 			'inline'            => false,
1046 1046
 			'on_front'          => true,
1047 1047
 			'show_names'        => true,
1048 1048
 			'date_format'       => 'm\/d\/Y',
1049 1049
 			'time_format'       => 'h:i A',
1050
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
1051
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
1050
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
1051
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
1052 1052
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
1053
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
1053
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
1054 1054
 			'show_in_rest'      => null,
1055 1055
 			'js_dependencies'   => array(),
1056 1056
 		) );
1057 1057
 
1058 1058
 		// Allow a filter override of the default value
1059
-		$args['default']    = apply_filters( 'cmb2_default_filter', $args['default'], $this );
1060
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
1061
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
1059
+		$args[ 'default' ]    = apply_filters( 'cmb2_default_filter', $args[ 'default' ], $this );
1060
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
1061
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
1062 1062
 
1063 1063
 		// options param can be passed a callback as well
1064
-		if ( is_callable( $args['options'] ) ) {
1065
-			$args['options_cb'] = $args['options'];
1066
-			$args['options'] = array();
1064
+		if ( is_callable( $args[ 'options' ] ) ) {
1065
+			$args[ 'options_cb' ] = $args[ 'options' ];
1066
+			$args[ 'options' ] = array();
1067 1067
 		}
1068 1068
 
1069
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
1069
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
1070 1070
 			'add_button'    => __( 'Add Group', 'cmb2' ),
1071 1071
 			'remove_button' => __( 'Remove Group', 'cmb2' ),
1072
-		) ) : $args['options'];
1072
+		) ) : $args[ 'options' ];
1073 1073
 
1074
-		$args['_id']        = $args['id'];
1075
-		$args['_name']      = $args['id'];
1074
+		$args[ '_id' ]        = $args[ 'id' ];
1075
+		$args[ '_name' ]      = $args[ 'id' ];
1076 1076
 
1077 1077
 		if ( $this->group ) {
1078 1078
 
1079
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
1080
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
1079
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
1080
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
1081 1081
 		}
1082 1082
 
1083
-		if ( 'wysiwyg' == $args['type'] ) {
1084
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
1085
-			$args['options']['textarea_name'] = $args['_name'];
1083
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
1084
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
1085
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
1086 1086
 		}
1087 1087
 
1088 1088
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
1089 1089
 
1090
-		if ( in_array( $args['type'], $option_types, true ) ) {
1090
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
1091 1091
 
1092
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
1093
-			$args['show_option_none'] = true === $args['show_option_none'] ? __( 'None', 'cmb2' ) : $args['show_option_none'];
1092
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
1093
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? __( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
1094 1094
 
1095
-			if ( null === $args['show_option_none'] ) {
1096
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
1097
-				$args['show_option_none'] = $off_by_default ? false : __( 'None', 'cmb2' );
1095
+			if ( null === $args[ 'show_option_none' ] ) {
1096
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
1097
+				$args[ 'show_option_none' ] = $off_by_default ? false : __( 'None', 'cmb2' );
1098 1098
 			}
1099 1099
 
1100 1100
 		}
1101 1101
 
1102
-		$args['has_supporting_data'] = in_array(
1103
-			$args['type'],
1102
+		$args[ 'has_supporting_data' ] = in_array(
1103
+			$args[ 'type' ],
1104 1104
 			array(
1105 1105
 				// See CMB2_Sanitize::_save_utc_value()
1106 1106
 				'file',
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
 	 * @param array $attrs Array of attributes to update
1120 1120
 	 */
1121 1121
 	public function maybe_set_attributes( $attrs = array() ) {
1122
-		return wp_parse_args( $this->args['attributes'], $attrs );
1122
+		return wp_parse_args( $this->args[ 'attributes' ], $attrs );
1123 1123
 	}
1124 1124
 
1125 1125
 }
Please login to merge, or discard this patch.
includes/CMB2_REST_Endpoints.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
 		if ( $cmb_id && ( $cmb = cmb2_get_metabox( $cmb_id, $this->object_id, $this->object_type ) ) ) {
171 171
 			$fields = array();
172 172
 			foreach ( $cmb->prop( 'fields', array() ) as $field ) {
173
-				$field = $this->get_rest_field( $cmb, $field['id'] );
173
+				$field = $this->get_rest_field( $cmb, $field[ 'id' ] );
174 174
 
175 175
 				if ( ! is_wp_error( $field ) ) {
176
-					$fields[ $field['id'] ] = $field;
176
+					$fields[ $field[ 'id' ] ] = $field;
177 177
 				} else {
178
-					$fields[ $field['id'] ] = array( 'error' => $field->get_error_message() );
178
+					$fields[ $field[ 'id' ] ] = array( 'error' => $field->get_error_message() );
179 179
 				}
180 180
 			}
181 181
 
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$boxes_data = $cmb->meta_box;
201 201
 
202
-		if ( isset( $_GET['rendered'] ) ) {
203
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
204
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
202
+		if ( isset( $_GET[ 'rendered' ] ) ) {
203
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
204
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
205 205
 
206 206
 			global $wp_scripts, $wp_styles;
207 207
 			$before_css = $wp_styles->queue;
@@ -209,14 +209,14 @@  discard block
 block discarded – undo
209 209
 
210 210
 			CMB2_JS::enqueue();
211 211
 
212
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
213
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
212
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
213
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
214 214
 		}
215 215
 
216 216
 		// TODO: look into 'embed' parameter.
217
-		unset( $boxes_data['fields'] );
217
+		unset( $boxes_data[ 'fields' ] );
218 218
 		// Handle callable properties.
219
-		unset( $boxes_data['show_on_cb'] );
219
+		unset( $boxes_data[ 'show_on_cb' ] );
220 220
 
221 221
 		$base = $this->namespace . '/boxes/' . $cmb->cmb_id;
222 222
 		$boxbase = $base . '/' . $cmb->cmb_id;
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 			),
235 235
 		) );
236 236
 
237
-		$boxes_data['_links'] = $response->get_links();
237
+		$boxes_data[ '_links' ] = $response->get_links();
238 238
 
239 239
 		return $boxes_data;
240 240
 	}
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	public function get_field( $request ) {
251 251
 		$this->initiate_request( $request );
252 252
 
253
-		$cmb = cmb2_get_metabox( $this->request->get_param( 'cmb_id' ), $this->object_id, $this->object_type  );
253
+		$cmb = cmb2_get_metabox( $this->request->get_param( 'cmb_id' ), $this->object_id, $this->object_type );
254 254
 
255 255
 		if ( ! $cmb ) {
256 256
 			return $this->prepare_item( array( 'error' => __( 'No box found by that id.', 'cmb2' ) ) );
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
 		// TODO: Use request get object
303 303
 		// Run this first so the js_dependencies arg is populated.
304
-		$rendered = isset( $_GET['rendered'] ) && ( $cb = $field->maybe_callback( 'render_row_cb' ) )
304
+		$rendered = isset( $_GET[ 'rendered' ] ) && ( $cb = $field->maybe_callback( 'render_row_cb' ) )
305 305
 			// Ok, callback is good, let's run it.
306 306
 			? $this->get_cb_results( $cb, $field->args(), $field )
307 307
 			: false;
@@ -330,11 +330,11 @@  discard block
 block discarded – undo
330 330
 			}
331 331
 		}
332 332
 
333
-		if ( isset( $_GET['rendered'] ) ) {
334
-			$field_data['rendered'] = $rendered;
333
+		if ( isset( $_GET[ 'rendered' ] ) ) {
334
+			$field_data[ 'rendered' ] = $rendered;
335 335
 		}
336 336
 
337
-		$field_data['value'] = $field->get_data();
337
+		$field_data[ 'value' ] = $field->get_data();
338 338
 
339 339
 		$base = $this->namespace . '/boxes/' . $cmb->cmb_id;
340 340
 
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 			),
352 352
 		) );
353 353
 
354
-		$field_data['_links'] = $response->get_links();
354
+		$field_data[ '_links' ] = $response->get_links();
355 355
 
356 356
 		return $field_data;
357 357
 	}
@@ -411,12 +411,12 @@  discard block
 block discarded – undo
411 411
 	public function initiate_request( $request ) {
412 412
 		$this->request = $request;
413 413
 
414
-		if ( isset( $_REQUEST['object_id'] ) ) {
415
-			$this->object_id = absint( $_REQUEST['object_id'] );
414
+		if ( isset( $_REQUEST[ 'object_id' ] ) ) {
415
+			$this->object_id = absint( $_REQUEST[ 'object_id' ] );
416 416
 		}
417 417
 
418
-		if ( isset( $_REQUEST['object_type'] ) ) {
419
-			$this->object_type = absint( $_REQUEST['object_type'] );
418
+		if ( isset( $_REQUEST[ 'object_type' ] ) ) {
419
+			$this->object_type = absint( $_REQUEST[ 'object_type' ] );
420 420
 		}
421 421
 	}
422 422
 
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 	 */
432 432
 	public function prepare_item_for_response( $data, $request ) {
433 433
 
434
-		$context = ! empty( $this->request['context'] ) ? $this->request['context'] : 'view';
434
+		$context = ! empty( $this->request[ 'context' ] ) ? $this->request[ 'context' ] : 'view';
435 435
 		$data = $this->filter_response_by_context( $data, $context );
436 436
 
437 437
 		/**
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
 	 */
201 201
 	public function concat_items( $args = array() ) {
202 202
 
203
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
204
-		unset( $args['method'] );
203
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
204
+		unset( $args[ 'method' ] );
205 205
 
206 206
 		$value = $this->field->escaped_value()
207 207
 			? $this->field->escaped_value()
@@ -219,12 +219,12 @@  discard block
 block discarded – undo
219 219
 			// Clone args & modify for just this item
220 220
 			$a = $args;
221 221
 
222
-			$a['value'] = $opt_value;
223
-			$a['label'] = $opt_label;
222
+			$a[ 'value' ] = $opt_value;
223
+			$a[ 'label' ] = $opt_label;
224 224
 
225 225
 			// Check if this option is the value of the input
226 226
 			if ( $value == $opt_value ) {
227
-				$a['checked'] = 'checked';
227
+				$a[ 'checked' ] = 'checked';
228 228
 			}
229 229
 
230 230
 			$concatenated_items .= $this->$method( $a, $i++ );
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	 * @return string       Generated option element html
241 241
 	 */
242 242
 	public function select_option( $args = array() ) {
243
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
243
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
244 244
 	}
245 245
 
246 246
 	/**
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 			'label' => '',
261 261
 		) );
262 262
 
263
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
263
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
264 264
 	}
265 265
 
266 266
 	/**
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function list_input_checkbox( $args, $i ) {
274 274
 		$saved_value = $this->field->escaped_value();
275
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
276
-			$args['checked'] = 'checked';
275
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
276
+			$args[ 'checked' ] = 'checked';
277 277
 		}
278
-		$args['type'] = 'checkbox';
278
+		$args[ 'type' ] = 'checkbox';
279 279
 		return $this->list_input( $args, $i );
280 280
 	}
281 281
 
@@ -426,11 +426,11 @@  discard block
 block discarded – undo
426 426
 			'js_dependencies' => array(),
427 427
 		) );
428 428
 
429
-		if ( ! empty( $a['js_dependencies'] ) ) {
430
-			$this->field->add_js_dependencies( $a['js_dependencies'] );
429
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
430
+			$this->field->add_js_dependencies( $a[ 'js_dependencies' ] );
431 431
 		}
432 432
 
433
-		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] );
433
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] );
434 434
 	}
435 435
 
436 436
 	/**
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
450 450
 			'desc'  => $this->_desc( true ),
451 451
 		) );
452
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] );
452
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] );
453 453
 	}
454 454
 
455 455
 	/**
@@ -500,8 +500,8 @@  discard block
 block discarded – undo
500 500
 			'options' => $this->field->options(),
501 501
 		) );
502 502
 
503
-		wp_editor( $a['value'], $a['id'], $a['options'] );
504
-		echo $a['desc'];
503
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
504
+		echo $a[ 'desc' ];
505 505
 	}
506 506
 
507 507
 	public function text_date( $args = array() ) {
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
513 513
 		) );
514 514
 
515
-		if ( false === strpos( $args['class'], 'timepicker' ) ) {
515
+		if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) {
516 516
 			$this->parse_picker_options( 'date' );
517 517
 		}
518 518
 
@@ -544,34 +544,34 @@  discard block
 block discarded – undo
544 544
 			'timepicker' => array(),
545 545
 		) );
546 546
 
547
-		if ( empty( $args['value'] ) ) {
548
-			$args['value'] = $this->field->escaped_value();
547
+		if ( empty( $args[ 'value' ] ) ) {
548
+			$args[ 'value' ] = $this->field->escaped_value();
549 549
 			// This will be used if there is a select_timezone set for this field
550 550
 			$tz_offset = $this->field->field_timezone_offset();
551 551
 			if ( ! empty( $tz_offset ) ) {
552
-				$args['value'] -= $tz_offset;
552
+				$args[ 'value' ] -= $tz_offset;
553 553
 			}
554 554
 		}
555 555
 
556
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
556
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
557 557
 
558
-		$date_args = wp_parse_args( $args['datepicker'], array(
558
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
559 559
 			'class' => 'cmb2-text-small cmb2-datepicker',
560 560
 			'name'  => $this->_name( '[date]' ),
561 561
 			'id'    => $this->_id( '_date' ),
562
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
562
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
563 563
 			'desc'  => '',
564 564
 		) );
565 565
 
566 566
 		// Let's get the date-format, and set it up as a data attr for the field.
567 567
 		$date_args = $this->parse_picker_options( 'date', $date_args );
568 568
 
569
-		$time_args = wp_parse_args( $args['timepicker'], array(
569
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
570 570
 			'class' => 'cmb2-timepicker text-time',
571 571
 			'name'  => $this->_name( '[time]' ),
572 572
 			'id'    => $this->_id( '_time' ),
573
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
574
-			'desc'  => $args['desc'],
573
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
574
+			'desc'  => $args[ 'desc' ],
575 575
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
576 576
 		) );
577 577
 
@@ -589,12 +589,12 @@  discard block
 block discarded – undo
589 589
 			'select_timezone'         => array(),
590 590
 		) );
591 591
 
592
-		$args['value'] = $this->field->escaped_value();
593
-		if ( is_array( $args['value'] ) ) {
594
-			$args['value'] = '';
592
+		$args[ 'value' ] = $this->field->escaped_value();
593
+		if ( is_array( $args[ 'value' ] ) ) {
594
+			$args[ 'value' ] = '';
595 595
 		}
596 596
 
597
-		$datetime = maybe_unserialize( $args['value'] );
597
+		$datetime = maybe_unserialize( $args[ 'value' ] );
598 598
 		$value = $tzstring = '';
599 599
 
600 600
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -603,24 +603,24 @@  discard block
 block discarded – undo
603 603
 			$value    = $datetime->getTimestamp();
604 604
 		}
605 605
 
606
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
606
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
607 607
 			'desc'  => '',
608 608
 			'value' => $value,
609 609
 		) );
610 610
 
611
-		$timezone_args = wp_parse_args( $args['select_timezone'], array(
611
+		$timezone_args = wp_parse_args( $args[ 'select_timezone' ], array(
612 612
 			'class'   => 'cmb2_select cmb2-select-timezone',
613 613
 			'name'    => $this->_name( '[timezone]' ),
614 614
 			'id'      => $this->_id( '_timezone' ),
615 615
 			'options' => wp_timezone_choice( $tzstring ),
616
-			'desc'    => $args['desc'],
616
+			'desc'    => $args[ 'desc' ],
617 617
 		) );
618 618
 
619 619
 		return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args );
620 620
 	}
621 621
 
622 622
 	public function select_timezone() {
623
-		$this->field->args['default'] = $this->field->args( 'default' )
623
+		$this->field->args[ 'default' ] = $this->field->args( 'default' )
624 624
 			? $this->field->args( 'default' )
625 625
 			: cmb2_utils()->timezone_string();
626 626
 
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 			'desc'  => $this->_desc( true ),
663 663
 		) );
664 664
 
665
-		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] );
665
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] );
666 666
 	}
667 667
 
668 668
 	public function select( $args = array() ) {
@@ -675,17 +675,17 @@  discard block
 block discarded – undo
675 675
 		) );
676 676
 
677 677
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
678
-		return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] );
678
+		return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] );
679 679
 	}
680 680
 
681 681
 	public function taxonomy_select() {
682 682
 
683 683
 		$names      = $this->get_object_terms();
684
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
684
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
685 685
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
686 686
 		$options    = '';
687 687
 
688
-		$option_none  = $this->field->args( 'show_option_none' );
688
+		$option_none = $this->field->args( 'show_option_none' );
689 689
 		if ( ! empty( $option_none ) ) {
690 690
 			$option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' );
691 691
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value );
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 			'desc'    => $this->_desc( true ),
716 716
 		) );
717 717
 
718
-		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
718
+		return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] );
719 719
 	}
720 720
 
721 721
 	public function radio_inline() {
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
 			: $is_checked;
751 751
 
752 752
 		if ( $is_checked ) {
753
-			$defaults['checked'] = 'checked';
753
+			$defaults[ 'checked' ] = 'checked';
754 754
 		}
755 755
 
756 756
 		$args = $this->parse_args( $args, 'checkbox', $defaults );
@@ -760,14 +760,14 @@  discard block
 block discarded – undo
760 760
 
761 761
 	public function taxonomy_radio() {
762 762
 		$names      = $this->get_object_terms();
763
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
763
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
764 764
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
765 765
 		$options    = ''; $i = 1;
766 766
 
767 767
 		if ( ! $terms ) {
768 768
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) );
769 769
 		} else {
770
-			$option_none  = $this->field->args( 'show_option_none' );
770
+			$option_none = $this->field->args( 'show_option_none' );
771 771
 			if ( ! empty( $option_none ) ) {
772 772
 				$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) );
773 773
 				$args = array(
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 					'label' => $option_none,
776 776
 				);
777 777
 				if ( $saved_term == $option_none_value ) {
778
-					$args['checked'] = 'checked';
778
+					$args[ 'checked' ] = 'checked';
779 779
 				}
780 780
 				$options .= $this->list_input( $args, $i );
781 781
 				$i++;
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 				);
789 789
 
790 790
 				if ( $saved_term == $term->slug ) {
791
-					$args['checked'] = 'checked';
791
+					$args[ 'checked' ] = 'checked';
792 792
 				}
793 793
 				$options .= $this->list_input( $args, $i );
794 794
 				$i++;
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 				);
826 826
 
827 827
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
828
-					$args['checked'] = 'checked';
828
+					$args[ 'checked' ] = 'checked';
829 829
 				}
830 830
 				$options .= $this->list_input( $args, $i );
831 831
 				$i++;
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 		$query_args = $this->field->args( 'query_args' );
931 931
 
932 932
 		// if options array and 'url' => false, then hide the url field
933
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
933
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
934 934
 
935 935
 		echo $this->input( array(
936 936
 			'type'  => $input_type,
@@ -951,8 +951,8 @@  discard block
 block discarded – undo
951 951
 		// Reset field args for attachment ID
952 952
 		$args = $this->field->args();
953 953
 		// If we're looking at a file in a group, we need to get the non-prefixed id
954
-		$args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
955
-		unset( $args['_id'], $args['_name'] );
954
+		$args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
955
+		unset( $args[ '_id' ], $args[ '_name' ] );
956 956
 
957 957
 		// And get new field object
958 958
 		$this->field = new CMB2_Field( array(
@@ -984,7 +984,7 @@  discard block
 block discarded – undo
984 984
 				if ( $_id_value ) {
985 985
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
986 986
 				} else {
987
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
987
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
988 988
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
989 989
 				}
990 990
 
@@ -1015,11 +1015,11 @@  discard block
 block discarded – undo
1015 1015
 	 */
1016 1016
 	public function img_status_output( $args ) {
1017 1017
 		printf( '<%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>',
1018
-			$args['tag'],
1019
-			$args['image'],
1020
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1018
+			$args[ 'tag' ],
1019
+			$args[ 'image' ],
1020
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1021 1021
 			esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ),
1022
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1022
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1023 1023
 		);
1024 1024
 	}
1025 1025
 
@@ -1031,14 +1031,14 @@  discard block
 block discarded – undo
1031 1031
 	 */
1032 1032
 	public function file_status_output( $args ) {
1033 1033
 		printf( '<%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>',
1034
-			$args['tag'],
1034
+			$args[ 'tag' ],
1035 1035
 			esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
1036
-			$this->get_file_name_from_path( $args['value'] ),
1037
-			$args['value'],
1036
+			$this->get_file_name_from_path( $args[ 'value' ] ),
1037
+			$args[ 'value' ],
1038 1038
 			esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ),
1039
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1039
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1040 1040
 			esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ),
1041
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1041
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1042 1042
 		);
1043 1043
 	}
1044 1044
 
@@ -1060,8 +1060,8 @@  discard block
 block discarded – undo
1060 1060
 			if ( $update ) {
1061 1061
 				$atts = $this->field->args( 'attributes' );
1062 1062
 			} else {
1063
-				$atts = isset( $args['attributes'] )
1064
-					? $args['attributes']
1063
+				$atts = isset( $args[ 'attributes' ] )
1064
+					? $args[ 'attributes' ]
1065 1065
 					: $atts;
1066 1066
 			}
1067 1067
 
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
 		}
1078 1078
 
1079 1079
 		if ( $update ) {
1080
-			$this->field->args['attributes'] = $atts;
1080
+			$this->field->args[ 'attributes' ] = $atts;
1081 1081
 		}
1082 1082
 
1083 1083
 		return array_merge( $args, $atts );
Please login to merge, or discard this patch.