@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * @return string Generated option element html |
20 | 20 | */ |
21 | 21 | public function select_option( $args = array() ) { |
22 | - return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n"; |
|
22 | + return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n"; |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | 'label' => '', |
40 | 40 | ), $args ); |
41 | 41 | |
42 | - return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] ); |
|
42 | + return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function list_input_checkbox( $args, $i ) { |
53 | 53 | $saved_value = $this->field->escaped_value(); |
54 | - if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) { |
|
55 | - $args['checked'] = 'checked'; |
|
54 | + if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) { |
|
55 | + $args[ 'checked' ] = 'checked'; |
|
56 | 56 | } |
57 | - $args['type'] = 'checkbox'; |
|
57 | + $args[ 'type' ] = 'checkbox'; |
|
58 | 58 | return $this->list_input( $args, $i ); |
59 | 59 | } |
60 | 60 | |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | public function concat_items( $args = array() ) { |
68 | 68 | $field = $this->field; |
69 | 69 | |
70 | - $method = isset( $args['method'] ) ? $args['method'] : 'select_option'; |
|
71 | - unset( $args['method'] ); |
|
70 | + $method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option'; |
|
71 | + unset( $args[ 'method' ] ); |
|
72 | 72 | |
73 | 73 | $value = $field->escaped_value() |
74 | 74 | ? $field->escaped_value() |
@@ -86,12 +86,12 @@ discard block |
||
86 | 86 | // Clone args & modify for just this item |
87 | 87 | $a = $args; |
88 | 88 | |
89 | - $a['value'] = $opt_value; |
|
90 | - $a['label'] = $opt_label; |
|
89 | + $a[ 'value' ] = $opt_value; |
|
90 | + $a[ 'label' ] = $opt_label; |
|
91 | 91 | |
92 | 92 | // Check if this option is the value of the input |
93 | 93 | if ( $value == $opt_value ) { |
94 | - $a['checked'] = 'checked'; |
|
94 | + $a[ 'checked' ] = 'checked'; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | $concatenated_items .= $this->$method( $a, $i++ ); |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) ); |
25 | 25 | |
26 | 26 | return $this->rendered( |
27 | - sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] ) |
|
27 | + sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] ) |
|
28 | 28 | ); |
29 | 29 | } |
30 | 30 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | ), $args ); |
32 | 32 | |
33 | 33 | return $this->rendered( |
34 | - sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] ) |
|
34 | + sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] ) |
|
35 | 35 | ); |
36 | 36 | } |
37 | 37 | } |
@@ -50,12 +50,12 @@ |
||
50 | 50 | 'js_dependencies' => array(), |
51 | 51 | ), $args ); |
52 | 52 | |
53 | - if ( ! empty( $a['js_dependencies'] ) ) { |
|
54 | - CMB2_JS::add_dependencies( $a['js_dependencies'] ); |
|
53 | + if ( ! empty( $a[ 'js_dependencies' ] ) ) { |
|
54 | + CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] ); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | return $this->rendered( |
58 | - sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] ) |
|
58 | + sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] ) |
|
59 | 59 | ); |
60 | 60 | } |
61 | 61 | } |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | 'select_timezone' => array(), |
23 | 23 | ) ); |
24 | 24 | |
25 | - $args['value'] = $field->escaped_value(); |
|
26 | - if ( is_array( $args['value'] ) ) { |
|
27 | - $args['value'] = ''; |
|
25 | + $args[ 'value' ] = $field->escaped_value(); |
|
26 | + if ( is_array( $args[ 'value' ] ) ) { |
|
27 | + $args[ 'value' ] = ''; |
|
28 | 28 | } |
29 | 29 | |
30 | - $datetime = maybe_unserialize( $args['value'] ); |
|
30 | + $datetime = maybe_unserialize( $args[ 'value' ] ); |
|
31 | 31 | $value = $tzstring = ''; |
32 | 32 | |
33 | 33 | if ( $datetime && $datetime instanceof DateTime ) { |
@@ -36,19 +36,19 @@ discard block |
||
36 | 36 | $value = $datetime->getTimestamp(); |
37 | 37 | } |
38 | 38 | |
39 | - $timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array( |
|
39 | + $timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array( |
|
40 | 40 | 'desc' => '', |
41 | 41 | 'value' => $value, |
42 | 42 | 'rendered' => true, |
43 | 43 | ) ); |
44 | 44 | $datetime_timestamp = $this->types->text_datetime_timestamp( $timestamp_args ); |
45 | 45 | |
46 | - $timezone_select_args = wp_parse_args( $args['select_timezone'], array( |
|
46 | + $timezone_select_args = wp_parse_args( $args[ 'select_timezone' ], array( |
|
47 | 47 | 'class' => 'cmb2_select cmb2-select-timezone', |
48 | 48 | 'name' => $this->_name( '[timezone]' ), |
49 | 49 | 'id' => $this->_id( '_timezone' ), |
50 | 50 | 'options' => wp_timezone_choice( $tzstring ), |
51 | - 'desc' => $args['desc'], |
|
51 | + 'desc' => $args[ 'desc' ], |
|
52 | 52 | 'rendered' => true, |
53 | 53 | ) ); |
54 | 54 | $select = $this->types->select( $timezone_select_args ); |
@@ -162,7 +162,7 @@ |
||
162 | 162 | * @return string String of attributes for form element |
163 | 163 | */ |
164 | 164 | public function concat_attrs( $attrs, $attr_exclude = array() ) { |
165 | - $attr_exclude[] = 'rendered'; |
|
165 | + $attr_exclude[ ] = 'rendered'; |
|
166 | 166 | $attributes = ''; |
167 | 167 | foreach ( $attrs as $attr => $val ) { |
168 | 168 | $excluded = in_array( $attr, (array) $attr_exclude, true ); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $output = ''; |
22 | 22 | |
23 | 23 | // if options array and 'url' => false, then hide the url field |
24 | - $input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text'; |
|
24 | + $input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text'; |
|
25 | 25 | |
26 | 26 | $output .= parent::render( array( |
27 | 27 | 'type' => $input_type, |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | if ( $_id_value ) { |
72 | 72 | $image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) ); |
73 | 73 | } else { |
74 | - $size = is_array( $img_size ) ? $img_size[0] : 350; |
|
74 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 350; |
|
75 | 75 | $image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />'; |
76 | 76 | } |
77 | 77 |
@@ -317,8 +317,8 @@ |
||
317 | 317 | * Reimplementation of DateTime::createFromFormat for PHP < 5.3. :( |
318 | 318 | * Borrowed from http://stackoverflow.com/questions/5399075/php-datetimecreatefromformat-in-5-2 |
319 | 319 | * |
320 | - * @param $date_format |
|
321 | - * @param $date_value |
|
320 | + * @param string $date_format |
|
321 | + * @param string $date_value |
|
322 | 322 | * |
323 | 323 | * @return DateTime |
324 | 324 | */ |
@@ -86,13 +86,13 @@ discard block |
||
86 | 86 | $oembed = cmb2_ajax()->get_oembed_no_edit( $args ); |
87 | 87 | |
88 | 88 | // Send back our embed |
89 | - if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) { |
|
90 | - return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>'; |
|
89 | + if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) { |
|
90 | + return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>'; |
|
91 | 91 | } |
92 | 92 | |
93 | - $error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed['fallback'], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' ); |
|
93 | + $error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed[ 'fallback' ], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' ); |
|
94 | 94 | |
95 | - if ( isset( $args['wp_error'] ) && $args['wp_error'] ) { |
|
95 | + if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) { |
|
96 | 96 | return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) ); |
97 | 97 | } |
98 | 98 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $cmb = CMB2_Boxes::get( $meta_box ); |
208 | 208 | } else { |
209 | 209 | // See if we already have an instance of this metabox |
210 | - $cmb = CMB2_Boxes::get( $meta_box['id'] ); |
|
210 | + $cmb = CMB2_Boxes::get( $meta_box[ 'id' ] ); |
|
211 | 211 | // If not, we'll initate a new metabox |
212 | 212 | $cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id ); |
213 | 213 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | ) ); |
284 | 284 | |
285 | 285 | // Set object type explicitly (rather than trying to guess from context) |
286 | - $cmb->object_type( $args['object_type'] ); |
|
286 | + $cmb->object_type( $args[ 'object_type' ] ); |
|
287 | 287 | |
288 | 288 | // Save the metabox if it's been submitted |
289 | 289 | // check permissions |
@@ -291,32 +291,32 @@ discard block |
||
291 | 291 | if ( |
292 | 292 | $cmb->prop( 'save_fields' ) |
293 | 293 | // check nonce |
294 | - && isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] ) |
|
294 | + && isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] ) |
|
295 | 295 | && wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() ) |
296 | - && $object_id && $_POST['object_id'] == $object_id |
|
296 | + && $object_id && $_POST[ 'object_id' ] == $object_id |
|
297 | 297 | ) { |
298 | 298 | $cmb->save_fields( $object_id, $cmb->object_type(), $_POST ); |
299 | 299 | } |
300 | 300 | |
301 | 301 | // Enqueue JS/CSS |
302 | - if ( $args['cmb_styles'] ) { |
|
302 | + if ( $args[ 'cmb_styles' ] ) { |
|
303 | 303 | CMB2_hookup::enqueue_cmb_css(); |
304 | 304 | } |
305 | 305 | |
306 | - if ( $args['enqueue_js'] ) { |
|
306 | + if ( $args[ 'enqueue_js' ] ) { |
|
307 | 307 | CMB2_hookup::enqueue_cmb_js(); |
308 | 308 | } |
309 | 309 | |
310 | - $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb ); |
|
310 | + $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb ); |
|
311 | 311 | |
312 | 312 | $format_parts = explode( '%3$s', $form_format ); |
313 | 313 | |
314 | 314 | // Show cmb form |
315 | - printf( $format_parts[0], $cmb->cmb_id, $object_id ); |
|
315 | + printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id ); |
|
316 | 316 | $cmb->show_form(); |
317 | 317 | |
318 | - if ( isset( $format_parts[1] ) && $format_parts[1] ) { |
|
319 | - printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] ); |
|
318 | + if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) { |
|
319 | + printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] ); |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * @param array $args Optional arguments array |
330 | 330 | */ |
331 | 331 | function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) { |
332 | - if ( ! isset( $args['echo'] ) || $args['echo'] ) { |
|
332 | + if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) { |
|
333 | 333 | cmb2_print_metabox_form( $meta_box, $object_id, $args ); |
334 | 334 | } else { |
335 | 335 | return cmb2_get_metabox_form( $meta_box, $object_id, $args ); |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | |
352 | 352 | $schedule_format = str_replace( |
353 | 353 | array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ), |
354 | - array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
354 | + array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
355 | 355 | $date_format |
356 | 356 | ); |
357 | 357 | |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | * 4 or 2 characters, as needed |
369 | 369 | */ |
370 | 370 | '%04d-%02d-%02d %02d:%02d:%02d', |
371 | - $parsed_time['tm_year'] + 1900, // This will be "111", so we need to add 1900. |
|
372 | - $parsed_time['tm_mon'] + 1, // This will be the month minus one, so we add one. |
|
373 | - $parsed_time['tm_mday'], |
|
374 | - $parsed_time['tm_hour'], |
|
375 | - $parsed_time['tm_min'], |
|
376 | - $parsed_time['tm_sec'] |
|
371 | + $parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900. |
|
372 | + $parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one. |
|
373 | + $parsed_time[ 'tm_mday' ], |
|
374 | + $parsed_time[ 'tm_hour' ], |
|
375 | + $parsed_time[ 'tm_min' ], |
|
376 | + $parsed_time[ 'tm_sec' ] |
|
377 | 377 | ); |
378 | 378 | |
379 | - return new DateTime($ymd); |
|
379 | + return new DateTime( $ymd ); |
|
380 | 380 | } |
381 | 381 | } |
@@ -409,6 +409,7 @@ discard block |
||
409 | 409 | * Add a hidden field to the list of hidden fields to be rendered later |
410 | 410 | * @since 2.0.0 |
411 | 411 | * @param array $field_args Array of field arguments to be passed to CMB2_Field |
412 | + * @param CMB2_Field $field_group |
|
412 | 413 | */ |
413 | 414 | public function add_hidden_field( $field_args, $field_group = null ) { |
414 | 415 | if ( isset( $field_args['field_args'] ) ) { |
@@ -610,7 +611,7 @@ discard block |
||
610 | 611 | /** |
611 | 612 | * Save a repeatable group |
612 | 613 | * @since 1.x.x |
613 | - * @param array $field_group CMB2_Field group field object |
|
614 | + * @param CMB2_Field $field_group CMB2_Field group field object |
|
614 | 615 | * @return mixed Return of CMB2_Field::update_data() |
615 | 616 | */ |
616 | 617 | public function save_group_field( $field_group ) { |
@@ -910,7 +911,7 @@ discard block |
||
910 | 911 | * @param mixed $field_id Field (or group field) ID |
911 | 912 | * @param mixed $field_args Array of field arguments |
912 | 913 | * @param mixed $sub_field_id Sub field ID (if field_group exists) |
913 | - * @param mixed $field_group If a sub-field, will be the parent group CMB2_Field object |
|
914 | + * @param CMB2_Field|null $field_group If a sub-field, will be the parent group CMB2_Field object |
|
914 | 915 | * @return array Array of CMB2_Field arguments |
915 | 916 | */ |
916 | 917 | public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) { |
@@ -997,7 +998,7 @@ discard block |
||
997 | 998 | * @since 2.0.0 |
998 | 999 | * @param array $field Metabox field config array |
999 | 1000 | * @param int $position (optional) Position of metabox. 1 for first, etc |
1000 | - * @return mixed Field id or false |
|
1001 | + * @return string Field id or false |
|
1001 | 1002 | */ |
1002 | 1003 | public function add_field( array $field, $position = 0 ) { |
1003 | 1004 | if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) { |
@@ -125,19 +125,19 @@ discard block |
||
125 | 125 | */ |
126 | 126 | public function __construct( $meta_box, $object_id = 0 ) { |
127 | 127 | |
128 | - if ( empty( $meta_box['id'] ) ) { |
|
128 | + if ( empty( $meta_box[ 'id' ] ) ) { |
|
129 | 129 | wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) ); |
130 | 130 | } |
131 | 131 | |
132 | 132 | $this->meta_box = wp_parse_args( $meta_box, $this->mb_defaults ); |
133 | - $this->meta_box['fields'] = array(); |
|
133 | + $this->meta_box[ 'fields' ] = array(); |
|
134 | 134 | |
135 | 135 | $this->object_id( $object_id ); |
136 | 136 | $this->mb_object_type(); |
137 | - $this->cmb_id = $meta_box['id']; |
|
137 | + $this->cmb_id = $meta_box[ 'id' ]; |
|
138 | 138 | |
139 | - if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) { |
|
140 | - $this->add_fields( $meta_box['fields'] ); |
|
139 | + if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) { |
|
140 | + $this->add_fields( $meta_box[ 'fields' ] ); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | CMB2_Boxes::add( $this ); |
@@ -308,22 +308,22 @@ discard block |
||
308 | 308 | * @return mixed CMB2_Field object if successful. |
309 | 309 | */ |
310 | 310 | public function render_field( $field_args ) { |
311 | - $field_args['context'] = $this->prop( 'context' ); |
|
311 | + $field_args[ 'context' ] = $this->prop( 'context' ); |
|
312 | 312 | |
313 | - if ( 'group' == $field_args['type'] ) { |
|
313 | + if ( 'group' == $field_args[ 'type' ] ) { |
|
314 | 314 | |
315 | - if ( ! isset( $field_args['show_names'] ) ) { |
|
316 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
315 | + if ( ! isset( $field_args[ 'show_names' ] ) ) { |
|
316 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
317 | 317 | } |
318 | 318 | $field = $this->render_group( $field_args ); |
319 | 319 | |
320 | - } elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) { |
|
320 | + } elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) { |
|
321 | 321 | // Save rendering for after the metabox |
322 | 322 | $field = $this->add_hidden_field( $field_args ); |
323 | 323 | |
324 | 324 | } else { |
325 | 325 | |
326 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
326 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
327 | 327 | |
328 | 328 | // Render default fields |
329 | 329 | $field = $this->get_field( $field_args )->render_field(); |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | */ |
340 | 340 | public function render_group( $args ) { |
341 | 341 | |
342 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
342 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
343 | 343 | return; |
344 | 344 | } |
345 | 345 | |
@@ -421,15 +421,15 @@ discard block |
||
421 | 421 | <div class="inside cmb-td cmb-nested cmb-field-list">'; |
422 | 422 | // Loop and render repeatable group fields |
423 | 423 | foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) { |
424 | - if ( 'hidden' == $field_args['type'] ) { |
|
424 | + if ( 'hidden' == $field_args[ 'type' ] ) { |
|
425 | 425 | |
426 | 426 | // Save rendering for after the metabox |
427 | 427 | $this->add_hidden_field( $field_args, $field_group ); |
428 | 428 | |
429 | 429 | } else { |
430 | 430 | |
431 | - $field_args['show_names'] = $field_group->args( 'show_names' ); |
|
432 | - $field_args['context'] = $field_group->args( 'context' ); |
|
431 | + $field_args[ 'show_names' ] = $field_group->args( 'show_names' ); |
|
432 | + $field_args[ 'context' ] = $field_group->args( 'context' ); |
|
433 | 433 | |
434 | 434 | $field = $this->get_field( $field_args, $field_group )->render_field(); |
435 | 435 | } |
@@ -457,14 +457,14 @@ discard block |
||
457 | 457 | * @param array $field_args Array of field arguments to be passed to CMB2_Field |
458 | 458 | */ |
459 | 459 | public function add_hidden_field( $field_args, $field_group = null ) { |
460 | - if ( isset( $field_args['field_args'] ) ) { |
|
460 | + if ( isset( $field_args[ 'field_args' ] ) ) { |
|
461 | 461 | // For back-compatibility. |
462 | 462 | $field = new CMB2_Field( $field_args ); |
463 | 463 | } else { |
464 | 464 | $field = $this->get_new_field( $field_args, $field_group ); |
465 | 465 | } |
466 | 466 | |
467 | - $this->hidden_fields[] = new CMB2_Types( $field ); |
|
467 | + $this->hidden_fields[ ] = new CMB2_Types( $field ); |
|
468 | 468 | |
469 | 469 | return $field; |
470 | 470 | } |
@@ -561,11 +561,11 @@ discard block |
||
561 | 561 | */ |
562 | 562 | public function process_field( $field_args ) { |
563 | 563 | |
564 | - switch ( $field_args['type'] ) { |
|
564 | + switch ( $field_args[ 'type' ] ) { |
|
565 | 565 | |
566 | 566 | case 'group': |
567 | 567 | if ( $this->save_group( $field_args ) ) { |
568 | - $this->updated[] = $field_args['id']; |
|
568 | + $this->updated[ ] = $field_args[ 'id' ]; |
|
569 | 569 | } |
570 | 570 | |
571 | 571 | break; |
@@ -579,7 +579,7 @@ discard block |
||
579 | 579 | $field = $this->get_new_field( $field_args ); |
580 | 580 | |
581 | 581 | if ( $field->save_field_from_data( $this->data_to_save ) ) { |
582 | - $this->updated[] = $field->id(); |
|
582 | + $this->updated[ ] = $field->id(); |
|
583 | 583 | } |
584 | 584 | |
585 | 585 | break; |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | * @return mixed Return of CMB2_Field::update_data() |
647 | 647 | */ |
648 | 648 | public function save_group( $args ) { |
649 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
649 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
650 | 650 | return; |
651 | 651 | } |
652 | 652 | |
@@ -694,16 +694,16 @@ discard block |
||
694 | 694 | $_new_val = array(); |
695 | 695 | foreach ( $new_val as $group_index => $grouped_data ) { |
696 | 696 | // Add the supporting data to the $saved array stack |
697 | - $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value']; |
|
697 | + $saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ]; |
|
698 | 698 | // Reset var to the actual value |
699 | - $_new_val[ $group_index ] = $grouped_data['value']; |
|
699 | + $_new_val[ $group_index ] = $grouped_data[ 'value' ]; |
|
700 | 700 | } |
701 | 701 | $new_val = $_new_val; |
702 | 702 | } else { |
703 | 703 | // Add the supporting data to the $saved array stack |
704 | - $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value']; |
|
704 | + $saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ]; |
|
705 | 705 | // Reset var to the actual value |
706 | - $new_val = $new_val['value']; |
|
706 | + $new_val = $new_val[ 'value' ]; |
|
707 | 707 | } |
708 | 708 | } |
709 | 709 | |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | |
718 | 718 | // Compare values and add to `$updated` array |
719 | 719 | if ( $is_updated || $is_removed ) { |
720 | - $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
720 | + $this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
721 | 721 | } |
722 | 722 | |
723 | 723 | // Add to `$saved` array |
@@ -754,22 +754,22 @@ discard block |
||
754 | 754 | // Try to get our object ID from the global space |
755 | 755 | switch ( $this->object_type() ) { |
756 | 756 | case 'user': |
757 | - $object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id; |
|
758 | - $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id; |
|
757 | + $object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id; |
|
758 | + $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id; |
|
759 | 759 | break; |
760 | 760 | |
761 | 761 | case 'comment': |
762 | - $object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id; |
|
763 | - $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id; |
|
762 | + $object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id; |
|
763 | + $object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id; |
|
764 | 764 | break; |
765 | 765 | |
766 | 766 | case 'term': |
767 | - $object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id; |
|
767 | + $object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id; |
|
768 | 768 | break; |
769 | 769 | |
770 | 770 | default: |
771 | - $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id; |
|
772 | - $object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id; |
|
771 | + $object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id; |
|
772 | + $object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id; |
|
773 | 773 | break; |
774 | 774 | } |
775 | 775 | |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | * @return boolean True/False |
846 | 846 | */ |
847 | 847 | public function is_options_page_mb() { |
848 | - 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'] ) ); |
|
848 | + 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' ] ) ); |
|
849 | 849 | } |
850 | 850 | |
851 | 851 | /** |
@@ -932,7 +932,7 @@ discard block |
||
932 | 932 | return $field; |
933 | 933 | } |
934 | 934 | |
935 | - $field_id = is_string( $field ) ? $field : $field['id']; |
|
935 | + $field_id = is_string( $field ) ? $field : $field[ 'id' ]; |
|
936 | 936 | |
937 | 937 | $parent_field_id = ! empty( $field_group ) ? $field_group->id() : ''; |
938 | 938 | $ids = $this->get_field_ids( $field_id, $parent_field_id, true ); |
@@ -968,16 +968,16 @@ discard block |
||
968 | 968 | if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) { |
969 | 969 | |
970 | 970 | // Update the fields array w/ any modified properties inherited from the group field |
971 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args; |
|
971 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args; |
|
972 | 972 | |
973 | 973 | return $this->get_default_args( $field_args, $field_group ); |
974 | 974 | } |
975 | 975 | |
976 | 976 | if ( is_array( $field_args ) ) { |
977 | - $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] ); |
|
977 | + $this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] ); |
|
978 | 978 | } |
979 | 979 | |
980 | - return $this->get_default_args( $this->meta_box['fields'][ $field_id ] ); |
|
980 | + return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
981 | 981 | } |
982 | 982 | |
983 | 983 | /** |
@@ -1027,8 +1027,8 @@ discard block |
||
1027 | 1027 | |
1028 | 1028 | $sub_fields = false; |
1029 | 1029 | if ( array_key_exists( 'fields', $field ) ) { |
1030 | - $sub_fields = $field['fields']; |
|
1031 | - unset( $field['fields'] ); |
|
1030 | + $sub_fields = $field[ 'fields' ]; |
|
1031 | + unset( $field[ 'fields' ] ); |
|
1032 | 1032 | } |
1033 | 1033 | |
1034 | 1034 | $field_id = $parent_field_id |
@@ -1053,29 +1053,29 @@ discard block |
||
1053 | 1053 | return false; |
1054 | 1054 | } |
1055 | 1055 | |
1056 | - if ( 'oembed' === $field['type'] ) { |
|
1056 | + if ( 'oembed' === $field[ 'type' ] ) { |
|
1057 | 1057 | // Initiate oembed Ajax hooks |
1058 | 1058 | cmb2_ajax(); |
1059 | 1059 | } |
1060 | 1060 | |
1061 | - if ( isset( $field['column'] ) && false !== $field['column'] ) { |
|
1061 | + if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) { |
|
1062 | 1062 | $this->has_columns = true; |
1063 | 1063 | |
1064 | - $column = is_array( $field['column'] ) ? $field['column'] : array(); |
|
1064 | + $column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array(); |
|
1065 | 1065 | |
1066 | - $field['column'] = wp_parse_args( $column, array( |
|
1067 | - 'name' => isset( $field['name'] ) ? $field['name'] : '', |
|
1066 | + $field[ 'column' ] = wp_parse_args( $column, array( |
|
1067 | + 'name' => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '', |
|
1068 | 1068 | 'position' => false, |
1069 | 1069 | ) ); |
1070 | 1070 | } |
1071 | 1071 | |
1072 | 1072 | $this->_add_field_to_array( |
1073 | 1073 | $field, |
1074 | - $this->meta_box['fields'], |
|
1074 | + $this->meta_box[ 'fields' ], |
|
1075 | 1075 | $position |
1076 | 1076 | ); |
1077 | 1077 | |
1078 | - return $field['id']; |
|
1078 | + return $field[ 'id' ]; |
|
1079 | 1079 | } |
1080 | 1080 | |
1081 | 1081 | /** |
@@ -1087,27 +1087,27 @@ discard block |
||
1087 | 1087 | * @return mixed Array of parent/field ids or false |
1088 | 1088 | */ |
1089 | 1089 | public function add_group_field( $parent_field_id, array $field, $position = 0 ) { |
1090 | - if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) { |
|
1090 | + if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) { |
|
1091 | 1091 | return false; |
1092 | 1092 | } |
1093 | 1093 | |
1094 | - $parent_field = $this->meta_box['fields'][ $parent_field_id ]; |
|
1094 | + $parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ]; |
|
1095 | 1095 | |
1096 | - if ( 'group' !== $parent_field['type'] ) { |
|
1096 | + if ( 'group' !== $parent_field[ 'type' ] ) { |
|
1097 | 1097 | return false; |
1098 | 1098 | } |
1099 | 1099 | |
1100 | - if ( ! isset( $parent_field['fields'] ) ) { |
|
1101 | - $this->meta_box['fields'][ $parent_field_id ]['fields'] = array(); |
|
1100 | + if ( ! isset( $parent_field[ 'fields' ] ) ) { |
|
1101 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array(); |
|
1102 | 1102 | } |
1103 | 1103 | |
1104 | 1104 | $this->_add_field_to_array( |
1105 | 1105 | $field, |
1106 | - $this->meta_box['fields'][ $parent_field_id ]['fields'], |
|
1106 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ], |
|
1107 | 1107 | $position |
1108 | 1108 | ); |
1109 | 1109 | |
1110 | - return array( $parent_field_id, $field['id'] ); |
|
1110 | + return array( $parent_field_id, $field[ 'id' ] ); |
|
1111 | 1111 | } |
1112 | 1112 | |
1113 | 1113 | /** |
@@ -1119,9 +1119,9 @@ discard block |
||
1119 | 1119 | */ |
1120 | 1120 | protected function _add_field_to_array( $field, &$fields, $position = 0 ) { |
1121 | 1121 | if ( $position ) { |
1122 | - cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position ); |
|
1122 | + cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position ); |
|
1123 | 1123 | } else { |
1124 | - $fields[ $field['id'] ] = $field; |
|
1124 | + $fields[ $field[ 'id' ] ] = $field; |
|
1125 | 1125 | } |
1126 | 1126 | } |
1127 | 1127 | |
@@ -1144,15 +1144,15 @@ discard block |
||
1144 | 1144 | unset( $this->fields[ implode( '', $ids ) ] ); |
1145 | 1145 | |
1146 | 1146 | if ( ! $sub_field_id ) { |
1147 | - unset( $this->meta_box['fields'][ $field_id ] ); |
|
1147 | + unset( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
1148 | 1148 | return true; |
1149 | 1149 | } |
1150 | 1150 | |
1151 | - if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) { |
|
1152 | - unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ); |
|
1151 | + if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) { |
|
1152 | + unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ); |
|
1153 | 1153 | } |
1154 | - if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) { |
|
1155 | - unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ); |
|
1154 | + if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) { |
|
1155 | + unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ); |
|
1156 | 1156 | } |
1157 | 1157 | return true; |
1158 | 1158 | } |
@@ -1176,11 +1176,11 @@ discard block |
||
1176 | 1176 | list( $field_id, $sub_field_id ) = $ids; |
1177 | 1177 | |
1178 | 1178 | if ( ! $sub_field_id ) { |
1179 | - $this->meta_box['fields'][ $field_id ][ $property ] = $value; |
|
1179 | + $this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value; |
|
1180 | 1180 | return $field_id; |
1181 | 1181 | } |
1182 | 1182 | |
1183 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value; |
|
1183 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value; |
|
1184 | 1184 | return $field_id; |
1185 | 1185 | } |
1186 | 1186 | |
@@ -1194,7 +1194,7 @@ discard block |
||
1194 | 1194 | public function get_field_ids( $field_id, $parent_field_id = '' ) { |
1195 | 1195 | $sub_field_id = $parent_field_id ? $field_id : ''; |
1196 | 1196 | $field_id = $parent_field_id ? $parent_field_id : $field_id; |
1197 | - $fields =& $this->meta_box['fields']; |
|
1197 | + $fields = & $this->meta_box[ 'fields' ]; |
|
1198 | 1198 | |
1199 | 1199 | if ( ! array_key_exists( $field_id, $fields ) ) { |
1200 | 1200 | $field_id = $this->search_old_school_array( $field_id, $fields ); |
@@ -1208,12 +1208,12 @@ discard block |
||
1208 | 1208 | return array( $field_id, $sub_field_id ); |
1209 | 1209 | } |
1210 | 1210 | |
1211 | - if ( 'group' !== $fields[ $field_id ]['type'] ) { |
|
1211 | + if ( 'group' !== $fields[ $field_id ][ 'type' ] ) { |
|
1212 | 1212 | return false; |
1213 | 1213 | } |
1214 | 1214 | |
1215 | - if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) { |
|
1216 | - $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] ); |
|
1215 | + if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) { |
|
1216 | + $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] ); |
|
1217 | 1217 | } |
1218 | 1218 | |
1219 | 1219 | return false === $sub_field_id ? false : array( $field_id, $sub_field_id ); |