Completed
Pull Request — trunk (#541)
by Justin
05:46
created
includes/CMB2_REST_Controller.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return array $data
129 129
 	 */
130 130
 	public function prepare_item_for_response( $data, $request = null ) {
131
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
131
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
132 132
 
133 133
 		/**
134 134
 		 * Filter the prepared CMB2 item response.
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 
171 171
 	public function initiate_request( $request, $request_type ) {
172 172
 		$this->request = $request;
173
-		$this->request['context'] = isset( $this->request['context'] ) && ! empty( $this->request['context'] )
174
-			? $this->request['context']
173
+		$this->request[ 'context' ] = isset( $this->request[ 'context' ] ) && ! empty( $this->request[ 'context' ] )
174
+			? $this->request[ 'context' ]
175 175
 			: 'view';
176 176
 
177
-		if ( isset( $_REQUEST['object_id'] ) ) {
178
-			$this->object_id = absint( $_REQUEST['object_id'] );
177
+		if ( isset( $_REQUEST[ 'object_id' ] ) ) {
178
+			$this->object_id = absint( $_REQUEST[ 'object_id' ] );
179 179
 		}
180 180
 
181
-		if ( isset( $_REQUEST['object_type'] ) ) {
182
-			$this->object_type = absint( $_REQUEST['object_type'] );
181
+		if ( isset( $_REQUEST[ 'object_type' ] ) ) {
182
+			$this->object_type = absint( $_REQUEST[ 'object_type' ] );
183 183
 		}
184 184
 
185 185
 		self::$request_type = self::$request_type ? self::$request_type : $request_type;
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller_Boxes.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		foreach ( CMB2_REST::$boxes as $this->rest_box ) {
71 71
 			if ( $this->rest_box->rest_read ) {
72 72
 				$rest_box = $this->get_rest_box();
73
-				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET['_embed'] ) );
73
+				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET[ '_embed' ] ) );
74 74
 			}
75 75
 		}
76 76
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 
111 111
 		$boxes_data = $cmb->meta_box;
112 112
 
113
-		if ( isset( $_REQUEST['_rendered'] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
113
+		if ( isset( $_REQUEST[ '_rendered' ] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
116 116
 
117 117
 			global $wp_scripts, $wp_styles;
118 118
 			$before_css = $wp_styles->queue;
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
 
121 121
 			CMB2_JS::enqueue();
122 122
 
123
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
123
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
125 125
 		}
126 126
 
127 127
 		// TODO: look into 'embed' parameter.
128 128
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
129
-		unset( $boxes_data['fields'] );
129
+		unset( $boxes_data[ 'fields' ] );
130 130
 		// Handle callable properties.
131
-		unset( $boxes_data['show_on_cb'] );
131
+		unset( $boxes_data[ 'show_on_cb' ] );
132 132
 
133 133
 		$response = rest_ensure_response( $boxes_data );
134 134
 
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller_Fields.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
 
68 68
 		$fields = array();
69 69
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
70
-			$field_id = $field['id'];
70
+			$field_id = $field[ 'id' ];
71 71
 			$rest_field = $this->get_rest_field( $field_id );
72 72
 
73 73
 			if ( ! is_wp_error( $rest_field ) ) {
74
-				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET['_embed'] ) );
74
+				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET[ '_embed' ] ) );
75 75
 			} else {
76 76
 				$fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() );
77 77
 			}
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
165 165
 			}
166 166
 		}
167 167
 
168
-		if ( isset( $_REQUEST['_rendered'] ) ) {
169
-			$field_data['rendered'] = $rendered;
168
+		if ( isset( $_REQUEST[ '_rendered' ] ) ) {
169
+			$field_data[ 'rendered' ] = $rendered;
170 170
 		}
171 171
 
172
-		$field_data['value'] = $field->get_data();
172
+		$field_data[ 'value' ] = $field->get_data();
173 173
 
174 174
 		return $field_data;
175 175
 	}
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
 		);
191 191
 
192 192
 		// TODO ?
193
-		error_log( '$this->request[context]: '. print_r( $this->request['context'], true ) );
194
-		error_log( 'CMB2_REST_Controller::get_intial_route(): '. print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
-		error_log( '$match: '. print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
193
+		error_log( '$this->request[context]: ' . print_r( $this->request[ 'context' ], true ) );
194
+		error_log( 'CMB2_REST_Controller::get_intial_route(): ' . print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
+		error_log( '$match: ' . print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
196 196
 
197 197
 
198 198
 		// Don't embed boxes when looking at boxes route.
199 199
 		if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
200
-			$links['up']['embeddable'] = true;
200
+			$links[ 'up' ][ 'embeddable' ] = true;
201 201
 		}
202 202
 
203 203
 		return $links;
Please login to merge, or discard this patch.
includes/CMB2_Ajax.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 	public function oembed_handler() {
54 54
 
55 55
 		// Verify our nonce
56
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
56
+		if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) {
57 57
 			die();
58 58
 		}
59 59
 
60 60
 		// Sanitize our search string
61
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
61
+		$oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] );
62 62
 
63 63
 		// Send back error if empty
64 64
 		if ( empty( $oembed_string ) ) {
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		}
67 67
 
68 68
 		// Set width of embed
69
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
69
+		$embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640';
70 70
 
71 71
 		// Set url
72 72
 		$oembed_url = esc_url( $oembed_string );
@@ -79,10 +79,10 @@  discard block
 block discarded – undo
79 79
 		// Get embed code (or fallback link)
80 80
 		$html = $this->get_oembed( array(
81 81
 			'url'         => $oembed_url,
82
-			'object_id'   => $_REQUEST['object_id'],
83
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
82
+			'object_id'   => $_REQUEST[ 'object_id' ],
83
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
84 84
 			'oembed_args' => $embed_args,
85
-			'field_id'    => $_REQUEST['field_id'],
85
+			'field_id'    => $_REQUEST[ 'field_id' ],
86 86
 		) );
87 87
 
88 88
 		wp_send_json_success( $html );
@@ -98,10 +98,10 @@  discard block
 block discarded – undo
98 98
 
99 99
 		global $wp_embed;
100 100
 
101
-		$oembed_url = esc_url( $args['url'] );
101
+		$oembed_url = esc_url( $args[ 'url' ] );
102 102
 
103 103
 		// Sanitize object_id
104
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
104
+		$this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] );
105 105
 
106 106
 		$args = wp_parse_args( $args, array(
107 107
 			'object_type' => 'post',
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 			'field_id'    => false,
110 110
 		) );
111 111
 
112
-		$this->embed_args =& $args;
112
+		$this->embed_args = & $args;
113 113
 
114 114
 		/**
115 115
 		 * Set the post_ID so oEmbed won't fail
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 		$wp_embed->post_ID = $this->object_id;
119 119
 
120 120
 		// Special scenario if NOT a post object
121
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
121
+		if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) {
122 122
 
123
-			if ( 'options-page' == $args['object_type'] ) {
123
+			if ( 'options-page' == $args[ 'object_type' ] ) {
124 124
 
125 125
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
126 126
 				$wp_embed->post_ID = 1987645321;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 			// Ok, we need to hijack the oembed cache system
130 130
 			$this->hijack = true;
131
-			$this->object_type = $args['object_type'];
131
+			$this->object_type = $args[ 'object_type' ];
132 132
 
133 133
 			// Gets ombed cache from our object's meta (vs postmeta)
134 134
 			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 		$embed_args = '';
142 142
 
143
-		foreach ( $args['oembed_args'] as $key => $val ) {
143
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
144 144
 			$embed_args .= " $key=\"$val\"";
145 145
 		}
146 146
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 
153 153
 		// Send back our embed
154 154
 		if ( $check_embed && $check_embed != $fallback ) {
155
-			return '<div class="embed-status">' . $check_embed . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $args['field_id'] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
155
+			return '<div class="embed-status">' . $check_embed . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $args[ 'field_id' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
156 156
 		}
157 157
 
158 158
 		// Otherwise, send back error info that no oEmbeds were found
@@ -219,15 +219,15 @@  discard block
 block discarded – undo
219 219
 	 */
220 220
 	protected function cache_action( $meta_key ) {
221 221
 		$func_args = func_get_args();
222
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
222
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
223 223
 
224 224
 		if ( 'options-page' === $this->object_type ) {
225 225
 
226 226
 			$args = array( $meta_key );
227 227
 
228 228
 			if ( 'update' === $action ) {
229
-				$args[] = $func_args[1];
230
-				$args[] = true;
229
+				$args[ ] = $func_args[ 1 ];
230
+				$args[ ] = true;
231 231
 			}
232 232
 
233 233
 			// Cache the result to our options
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 		} else {
236 236
 
237 237
 			$args = array( $this->object_type, $this->object_id, $meta_key );
238
-			$args[] = 'update' === $action ? $func_args : true;
238
+			$args[ ] = 'update' === $action ? $func_args : true;
239 239
 
240 240
 			// Cache the result to our metadata
241 241
 			$status = call_user_func_array( $action . '_metadata', $args );
Please login to merge, or discard this patch.
includes/CMB2.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -119,19 +119,19 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public function __construct( $meta_box, $object_id = 0 ) {
121 121
 
122
-		if ( empty( $meta_box['id'] ) ) {
122
+		if ( empty( $meta_box[ 'id' ] ) ) {
123 123
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
124 124
 		}
125 125
 
126 126
 		$this->meta_box = wp_parse_args( $meta_box, $this->mb_defaults );
127
-		$this->meta_box['fields'] = array();
127
+		$this->meta_box[ 'fields' ] = array();
128 128
 
129 129
 		$this->object_id( $object_id );
130 130
 		$this->mb_object_type();
131
-		$this->cmb_id = $meta_box['id'];
131
+		$this->cmb_id = $meta_box[ 'id' ];
132 132
 
133
-		if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) {
134
-			$this->add_fields( $meta_box['fields'] );
133
+		if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) {
134
+			$this->add_fields( $meta_box[ 'fields' ] );
135 135
 		}
136 136
 
137 137
 		CMB2_Boxes::add( $this );
@@ -262,16 +262,16 @@  discard block
 block discarded – undo
262 262
 	 * @return mixed CMB2_Field object if successful.
263 263
 	 */
264 264
 	public function render_field( $field_args ) {
265
-		$field_args['context'] = $this->prop( 'context' );
265
+		$field_args[ 'context' ] = $this->prop( 'context' );
266 266
 
267
-		if ( 'group' == $field_args['type'] ) {
267
+		if ( 'group' == $field_args[ 'type' ] ) {
268 268
 
269
-			if ( ! isset( $field_args['show_names'] ) ) {
270
-				$field_args['show_names'] = $this->prop( 'show_names' );
269
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
270
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
271 271
 			}
272 272
 			$field = $this->render_group( $field_args );
273 273
 
274
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
274
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
275 275
 			// Save rendering for after the metabox
276 276
 			$field = $this->add_hidden_field( array(
277 277
 				'field_args'  => $field_args,
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 
282 282
 		} else {
283 283
 
284
-			$field_args['show_names'] = $this->prop( 'show_names' );
284
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
285 285
 
286 286
 			// Render default fields
287 287
 			$field = $this->get_field( $field_args )->render_field();
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	 */
298 298
 	public function render_group( $args ) {
299 299
 
300
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
300
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
301 301
 			return;
302 302
 		}
303 303
 
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
380 380
 				// Loop and render repeatable group fields
381 381
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
382
-					if ( 'hidden' == $field_args['type'] ) {
382
+					if ( 'hidden' == $field_args[ 'type' ] ) {
383 383
 
384 384
 						// Save rendering for after the metabox
385 385
 						$this->add_hidden_field( array(
@@ -389,8 +389,8 @@  discard block
 block discarded – undo
389 389
 
390 390
 					} else {
391 391
 
392
-						$field_args['show_names'] = $field_group->args( 'show_names' );
393
-						$field_args['context']    = $field_group->args( 'context' );
392
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
393
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
394 394
 
395 395
 						$field = $this->get_field( $field_args, $field_group )->render_field();
396 396
 					}
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	public function add_hidden_field( $args ) {
421 421
 		$field = new CMB2_Field( $args );
422
-		$this->hidden_fields[] = new CMB2_Types( $field );
422
+		$this->hidden_fields[ ] = new CMB2_Types( $field );
423 423
 
424 424
 		return $field;
425 425
 	}
@@ -516,11 +516,11 @@  discard block
 block discarded – undo
516 516
 	 */
517 517
 	public function process_field( $field_args ) {
518 518
 
519
-		switch ( $field_args['type'] ) {
519
+		switch ( $field_args[ 'type' ] ) {
520 520
 
521 521
 			case 'group':
522 522
 				if ( $this->save_group( $field_args ) ) {
523
-					$this->updated[] = $field_args['id'];
523
+					$this->updated[ ] = $field_args[ 'id' ];
524 524
 				}
525 525
 
526 526
 				break;
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 				) );
540 540
 
541 541
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
542
-					$this->updated[] = $field->id();
542
+					$this->updated[ ] = $field->id();
543 543
 				}
544 544
 
545 545
 				break;
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 	 * @return mixed        Return of CMB2_Field::update_data()
607 607
 	 */
608 608
 	public function save_group( $args ) {
609
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
609
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
610 610
 			return;
611 611
 		}
612 612
 
@@ -660,16 +660,16 @@  discard block
 block discarded – undo
660 660
 						$_new_val = array();
661 661
 						foreach ( $new_val as $group_index => $grouped_data ) {
662 662
 							// Add the supporting data to the $saved array stack
663
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
663
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
664 664
 							// Reset var to the actual value
665
-							$_new_val[ $group_index ] = $grouped_data['value'];
665
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
666 666
 						}
667 667
 						$new_val = $_new_val;
668 668
 					} else {
669 669
 						// Add the supporting data to the $saved array stack
670
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
670
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
671 671
 						// Reset var to the actual value
672
-						$new_val = $new_val['value'];
672
+						$new_val = $new_val[ 'value' ];
673 673
 					}
674 674
 				}
675 675
 
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
 				$is_removed = ( empty( $new_val ) && ! empty( $old_val ) );
683 683
 				// Compare values and add to `$updated` array
684 684
 				if ( $is_updated || $is_removed ) {
685
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
685
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
686 686
 				}
687 687
 
688 688
 				// Add to `$saved` array
@@ -717,22 +717,22 @@  discard block
 block discarded – undo
717 717
 		// Try to get our object ID from the global space
718 718
 		switch ( $this->object_type() ) {
719 719
 			case 'user':
720
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
721
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
720
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
721
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
722 722
 				break;
723 723
 
724 724
 			case 'comment':
725
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
726
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
725
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
726
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
727 727
 				break;
728 728
 
729 729
 			case 'term':
730
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
730
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
731 731
 				break;
732 732
 
733 733
 			default:
734
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
735
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
734
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
735
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
736 736
 				break;
737 737
 		}
738 738
 
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 	 * @return boolean True/False
805 805
 	 */
806 806
 	public function is_options_page_mb() {
807
-		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'] ) );
807
+		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' ] ) );
808 808
 	}
809 809
 
810 810
 	/**
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
883 883
 			return $field;
884 884
 		}
885 885
 
886
-		$field_id = is_string( $field ) ? $field : $field['id'];
886
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
887 887
 
888 888
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
889 889
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
920 920
 
921 921
 			// Update the fields array w/ any modified properties inherited from the group field
922
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
922
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
923 923
 
924 924
 			return array(
925 925
 				'field_args'  => $field_args,
@@ -929,11 +929,11 @@  discard block
 block discarded – undo
929 929
 		}
930 930
 
931 931
 		if ( is_array( $field_args ) ) {
932
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
932
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
933 933
 		}
934 934
 
935 935
 		return array(
936
-			'field_args'  => $this->meta_box['fields'][ $field_id ],
936
+			'field_args'  => $this->meta_box[ 'fields' ][ $field_id ],
937 937
 			'object_type' => $this->object_type(),
938 938
 			'object_id'   => $this->object_id(),
939 939
 		);
@@ -950,8 +950,8 @@  discard block
 block discarded – undo
950 950
 
951 951
 			$sub_fields = false;
952 952
 			if ( array_key_exists( 'fields', $field ) ) {
953
-				$sub_fields = $field['fields'];
954
-				unset( $field['fields'] );
953
+				$sub_fields = $field[ 'fields' ];
954
+				unset( $field[ 'fields' ] );
955 955
 			}
956 956
 
957 957
 			$field_id = $parent_field_id
@@ -976,18 +976,18 @@  discard block
 block discarded – undo
976 976
 			return false;
977 977
 		}
978 978
 
979
-		if ( 'oembed' === $field['type'] ) {
979
+		if ( 'oembed' === $field[ 'type' ] ) {
980 980
 			// Initiate oembed Ajax hooks
981 981
 			cmb2_ajax();
982 982
 		}
983 983
 
984 984
 		$this->_add_field_to_array(
985 985
 			$field,
986
-			$this->meta_box['fields'],
986
+			$this->meta_box[ 'fields' ],
987 987
 			$position
988 988
 		);
989 989
 
990
-		return $field['id'];
990
+		return $field[ 'id' ];
991 991
 	}
992 992
 
993 993
 	/**
@@ -999,27 +999,27 @@  discard block
 block discarded – undo
999 999
 	 * @return mixed                   Array of parent/field ids or false
1000 1000
 	 */
1001 1001
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
1002
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
1002
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
1003 1003
 			return false;
1004 1004
 		}
1005 1005
 
1006
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
1006
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
1007 1007
 
1008
-		if ( 'group' !== $parent_field['type'] ) {
1008
+		if ( 'group' !== $parent_field[ 'type' ] ) {
1009 1009
 			return false;
1010 1010
 		}
1011 1011
 
1012
-		if ( ! isset( $parent_field['fields'] ) ) {
1013
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
1012
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
1013
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
1014 1014
 		}
1015 1015
 
1016 1016
 		$this->_add_field_to_array(
1017 1017
 			$field,
1018
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
1018
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
1019 1019
 			$position
1020 1020
 		);
1021 1021
 
1022
-		return array( $parent_field_id, $field['id'] );
1022
+		return array( $parent_field_id, $field[ 'id' ] );
1023 1023
 	}
1024 1024
 
1025 1025
 	/**
@@ -1031,9 +1031,9 @@  discard block
 block discarded – undo
1031 1031
 	 */
1032 1032
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
1033 1033
 		if ( $position ) {
1034
-			cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position );
1034
+			cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
1035 1035
 		} else {
1036
-			$fields[ $field['id'] ] = $field;
1036
+			$fields[ $field[ 'id' ] ] = $field;
1037 1037
 		}
1038 1038
 	}
1039 1039
 
@@ -1056,15 +1056,15 @@  discard block
 block discarded – undo
1056 1056
 		unset( $this->fields[ implode( '', $ids ) ] );
1057 1057
 
1058 1058
 		if ( ! $sub_field_id ) {
1059
-			unset( $this->meta_box['fields'][ $field_id ] );
1059
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1060 1060
 			return true;
1061 1061
 		}
1062 1062
 
1063
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1064
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1063
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1064
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1065 1065
 		}
1066
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1067
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1066
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1067
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1068 1068
 		}
1069 1069
 		return true;
1070 1070
 	}
@@ -1088,11 +1088,11 @@  discard block
 block discarded – undo
1088 1088
 		list( $field_id, $sub_field_id ) = $ids;
1089 1089
 
1090 1090
 		if ( ! $sub_field_id ) {
1091
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1091
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1092 1092
 			return $field_id;
1093 1093
 		}
1094 1094
 
1095
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1095
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1096 1096
 		return $field_id;
1097 1097
 	}
1098 1098
 
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1107 1107
 		$sub_field_id = $parent_field_id ? $field_id : '';
1108 1108
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1109
-		$fields       =& $this->meta_box['fields'];
1109
+		$fields       = & $this->meta_box[ 'fields' ];
1110 1110
 
1111 1111
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1112 1112
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1120,12 +1120,12 @@  discard block
 block discarded – undo
1120 1120
 			return array( $field_id, $sub_field_id );
1121 1121
 		}
1122 1122
 
1123
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1123
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1124 1124
 			return false;
1125 1125
 		}
1126 1126
 
1127
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1128
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1127
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1128
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1129 1129
 		}
1130 1130
 
1131 1131
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Oembed.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 			'data-objecttype' => $field->object_type,
34 34
 		) )
35 35
 		. '<p class="cmb-spinner spinner" style="display:none;"></p>'
36
-		. '<div id="'. $this->_id( '-status' ). '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>';
36
+		. '<div id="' . $this->_id( '-status' ) . '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>';
37 37
 	}
38 38
 
39 39
 }
Please login to merge, or discard this patch.
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', __( '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', __( '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', __( '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', __( '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/types/CMB2_Type_Select_Timezone.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
 	public function render() {
16 16
 
17
-		$this->field->args['default'] = $this->field->get_default()
17
+		$this->field->args[ 'default' ] = $this->field->get_default()
18 18
 			? $this->field->get_default()
19 19
 			: cmb2_utils()->timezone_string();
20 20
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Wysiwyg.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 			'options' => $this->field->options(),
27 27
 		) );
28 28
 
29
-		wp_editor( $a['value'], $a['id'], $a['options'] );
30
-		echo $a['desc'];
29
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
30
+		echo $a[ 'desc' ];
31 31
 	}
32 32
 }
Please login to merge, or discard this patch.