@@ -15,7 +15,7 @@ |
||
| 15 | 15 | public function render() { |
| 16 | 16 | $names = $this->get_object_terms(); |
| 17 | 17 | |
| 18 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug; |
|
| 18 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug; |
|
| 19 | 19 | $terms = $this->get_terms(); |
| 20 | 20 | $options = ''; |
| 21 | 21 | $option_none = $this->field->args( 'show_option_none' ); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | if ( is_array( $this->field->value ) ) { |
| 125 | 125 | |
| 126 | 126 | // Then loop and output. |
| 127 | - echo '<ul class="cmb2-'. str_replace( '_', '-', $this->field->type() ) .'">'; |
|
| 127 | + echo '<ul class="cmb2-' . str_replace( '_', '-', $this->field->type() ) . '">'; |
|
| 128 | 128 | foreach ( $this->field->value as $val ) { |
| 129 | 129 | $this->value = $val; |
| 130 | 130 | echo '<li>', $this->_display(), '</li>'; |
@@ -197,8 +197,8 @@ discard block |
||
| 197 | 197 | $options = $this->field->options(); |
| 198 | 198 | |
| 199 | 199 | $fallback = $this->field->args( 'show_option_none' ); |
| 200 | - if ( ! $fallback && isset( $options[''] ) ) { |
|
| 201 | - $fallback = $options['']; |
|
| 200 | + if ( ! $fallback && isset( $options[ '' ] ) ) { |
|
| 201 | + $fallback = $options[ '' ]; |
|
| 202 | 202 | } |
| 203 | 203 | if ( ! $this->value && $fallback ) { |
| 204 | 204 | echo $fallback; |
@@ -225,9 +225,9 @@ discard block |
||
| 225 | 225 | $output = array(); |
| 226 | 226 | foreach ( $this->value as $val ) { |
| 227 | 227 | if ( isset( $options[ $val ] ) ) { |
| 228 | - $output[] = $options[ $val ]; |
|
| 228 | + $output[ ] = $options[ $val ]; |
|
| 229 | 229 | } else { |
| 230 | - $output[] = esc_attr( $val ); |
|
| 230 | + $output[ ] = esc_attr( $val ); |
|
| 231 | 231 | } |
| 232 | 232 | } |
| 233 | 233 | |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | * @since 2.2.2 |
| 252 | 252 | */ |
| 253 | 253 | protected function _display() { |
| 254 | - echo '<xmp class="cmb2-code">'. print_r( $this->value, true ) .'</xmp>'; |
|
| 254 | + echo '<xmp class="cmb2-code">' . print_r( $this->value, true ) . '</xmp>'; |
|
| 255 | 255 | } |
| 256 | 256 | } |
| 257 | 257 | |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | if ( $datetime && $datetime instanceof DateTime ) { |
| 294 | 294 | $tz = $datetime->getTimezone(); |
| 295 | 295 | $tzstring = $tz->getName(); |
| 296 | - $this->value = $datetime->getTimestamp(); |
|
| 296 | + $this->value = $datetime->getTimestamp(); |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | $date = $this->field->get_timestamp_format( 'date_format', $this->value ); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | if ( is_wp_error( $terms ) || empty( $terms ) && ( $default = $this->field->get_default() ) ) { |
| 318 | 318 | $term = get_term_by( 'slug', $default, $taxonomy ); |
| 319 | 319 | } elseif ( ! empty( $terms ) ) { |
| 320 | - $term = $terms[key( $terms )]; |
|
| 320 | + $term = $terms[ key( $terms ) ]; |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | if ( $term ) { |
@@ -341,10 +341,10 @@ discard block |
||
| 341 | 341 | $terms = array(); |
| 342 | 342 | if ( is_array( $default ) ) { |
| 343 | 343 | foreach ( $default as $slug ) { |
| 344 | - $terms[] = get_term_by( 'slug', $slug, $taxonomy ); |
|
| 344 | + $terms[ ] = get_term_by( 'slug', $slug, $taxonomy ); |
|
| 345 | 345 | } |
| 346 | 346 | } else { |
| 347 | - $terms[] = get_term_by( 'slug', $default, $taxonomy ); |
|
| 347 | + $terms[ ] = get_term_by( 'slug', $default, $taxonomy ); |
|
| 348 | 348 | } |
| 349 | 349 | } |
| 350 | 350 | |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | $links = array(); |
| 354 | 354 | foreach ( $terms as $term ) { |
| 355 | 355 | $link = get_edit_term_link( $term->term_id, $taxonomy ); |
| 356 | - $links[] = '<a href="'. esc_url( $link ) .'">'. esc_html( $term->name ) .'</a>'; |
|
| 356 | + $links[ ] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>'; |
|
| 357 | 357 | } |
| 358 | 358 | // Then loop and output. |
| 359 | 359 | echo '<div class="cmb2-taxonomy-terms-', esc_attr( $taxonomy ), '">'; |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | if ( $id ) { |
| 397 | 397 | $image = wp_get_attachment_image( $id, $img_size, null, array( 'class' => 'cmb-image-display' ) ); |
| 398 | 398 | } else { |
| 399 | - $size = is_array( $img_size ) ? $img_size[0] : 200; |
|
| 399 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 200; |
|
| 400 | 400 | $image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $url_value . '" alt="" />'; |
| 401 | 401 | } |
| 402 | 402 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | if ( $this->cmb->has_columns ) { |
| 121 | 121 | add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) ); |
| 122 | - add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 ); |
|
| 122 | + add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 ); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | if ( $this->cmb->has_columns ) { |
| 138 | 138 | add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) ); |
| 139 | - add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 ); |
|
| 139 | + add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 ); |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | if ( $this->cmb->has_columns ) { |
| 172 | 172 | add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) ); |
| 173 | - add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 ); |
|
| 173 | + add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 ); |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | |
@@ -263,25 +263,25 @@ discard block |
||
| 263 | 263 | $fields = $this->cmb->prop( 'fields' ); |
| 264 | 264 | |
| 265 | 265 | foreach ( $fields as $key => $field ) { |
| 266 | - if ( ! isset( $field['column'] ) ) { |
|
| 266 | + if ( ! isset( $field[ 'column' ] ) ) { |
|
| 267 | 267 | continue; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - $column = $field['column']; |
|
| 270 | + $column = $field[ 'column' ]; |
|
| 271 | 271 | |
| 272 | - if ( false === $column['position'] ) { |
|
| 272 | + if ( false === $column[ 'position' ] ) { |
|
| 273 | 273 | |
| 274 | - $columns[ $field['id'] ] = $column['name']; |
|
| 274 | + $columns[ $field[ 'id' ] ] = $column[ 'name' ]; |
|
| 275 | 275 | |
| 276 | 276 | } else { |
| 277 | 277 | |
| 278 | - $before = array_slice( $columns, 0, absint( $column['position'] ) ); |
|
| 279 | - $before[ $field['id'] ] = $column['name']; |
|
| 278 | + $before = array_slice( $columns, 0, absint( $column[ 'position' ] ) ); |
|
| 279 | + $before[ $field[ 'id' ] ] = $column[ 'name' ]; |
|
| 280 | 280 | $columns = $before + $columns; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - $column['field'] = $field; |
|
| 284 | - $this->columns[ $field['id'] ] = $column; |
|
| 283 | + $column[ 'field' ] = $field; |
|
| 284 | + $this->columns[ $field[ 'id' ] ] = $column; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | return $columns; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | public function column_display( $column_name, $object_id ) { |
| 295 | 295 | if ( isset( $this->columns[ $column_name ] ) ) { |
| 296 | 296 | $field = new CMB2_Field( array( |
| 297 | - 'field_args' => $this->columns[ $column_name ]['field'], |
|
| 297 | + 'field_args' => $this->columns[ $column_name ][ 'field' ], |
|
| 298 | 298 | 'object_type' => $this->object_type, |
| 299 | 299 | 'object_id' => $this->cmb->object_id( $object_id ), |
| 300 | 300 | 'cmb_id' => $this->cmb->cmb_id, |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | * @return array Modified array of classes |
| 356 | 356 | */ |
| 357 | 357 | public function close_metabox_class( $classes ) { |
| 358 | - $classes[] = 'closed'; |
|
| 358 | + $classes[ ] = 'closed'; |
|
| 359 | 359 | return $classes; |
| 360 | 360 | } |
| 361 | 361 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | public function user_new_metabox( $section ) { |
| 376 | 376 | if ( $section == $this->cmb->prop( 'new_user_section' ) ) { |
| 377 | 377 | $object_id = $this->cmb->object_id(); |
| 378 | - $this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id ); |
|
| 378 | + $this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id ); |
|
| 379 | 379 | $this->user_metabox(); |
| 380 | 380 | } |
| 381 | 381 | } |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | if ( $this->taxonomy_can_save( $taxonomy ) ) { |
| 556 | 556 | |
| 557 | 557 | foreach ( $this->cmb->prop( 'fields' ) as $field ) { |
| 558 | - $data_to_delete[ $field['id'] ] = ''; |
|
| 558 | + $data_to_delete[ $field[ 'id' ] ] = ''; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | $this->cmb->save_fields( $term_id, 'term', $data_to_delete ); |
@@ -86,18 +86,18 @@ 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 | 93 | $error = sprintf( |
| 94 | 94 | /* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */ |
| 95 | 95 | esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ), |
| 96 | - $oembed['fallback'], |
|
| 96 | + $oembed[ 'fallback' ], |
|
| 97 | 97 | '<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' |
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | - if ( isset( $args['wp_error'] ) && $args['wp_error'] ) { |
|
| 100 | + if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) { |
|
| 101 | 101 | return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) ); |
| 102 | 102 | } |
| 103 | 103 | |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $cmb = CMB2_Boxes::get( $meta_box ); |
| 213 | 213 | } else { |
| 214 | 214 | // See if we already have an instance of this metabox |
| 215 | - $cmb = CMB2_Boxes::get( $meta_box['id'] ); |
|
| 215 | + $cmb = CMB2_Boxes::get( $meta_box[ 'id' ] ); |
|
| 216 | 216 | // If not, we'll initate a new metabox |
| 217 | 217 | $cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id ); |
| 218 | 218 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | ) ); |
| 289 | 289 | |
| 290 | 290 | // Set object type explicitly (rather than trying to guess from context) |
| 291 | - $cmb->object_type( $args['object_type'] ); |
|
| 291 | + $cmb->object_type( $args[ 'object_type' ] ); |
|
| 292 | 292 | |
| 293 | 293 | // Save the metabox if it's been submitted |
| 294 | 294 | // check permissions |
@@ -296,32 +296,32 @@ discard block |
||
| 296 | 296 | if ( |
| 297 | 297 | $cmb->prop( 'save_fields' ) |
| 298 | 298 | // check nonce |
| 299 | - && isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] ) |
|
| 299 | + && isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] ) |
|
| 300 | 300 | && wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() ) |
| 301 | - && $object_id && $_POST['object_id'] == $object_id |
|
| 301 | + && $object_id && $_POST[ 'object_id' ] == $object_id |
|
| 302 | 302 | ) { |
| 303 | 303 | $cmb->save_fields( $object_id, $cmb->object_type(), $_POST ); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | // Enqueue JS/CSS |
| 307 | - if ( $args['cmb_styles'] ) { |
|
| 307 | + if ( $args[ 'cmb_styles' ] ) { |
|
| 308 | 308 | CMB2_hookup::enqueue_cmb_css(); |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - if ( $args['enqueue_js'] ) { |
|
| 311 | + if ( $args[ 'enqueue_js' ] ) { |
|
| 312 | 312 | CMB2_hookup::enqueue_cmb_js(); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb ); |
|
| 315 | + $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb ); |
|
| 316 | 316 | |
| 317 | 317 | $format_parts = explode( '%3$s', $form_format ); |
| 318 | 318 | |
| 319 | 319 | // Show cmb form |
| 320 | - printf( $format_parts[0], $cmb->cmb_id, $object_id ); |
|
| 320 | + printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id ); |
|
| 321 | 321 | $cmb->show_form(); |
| 322 | 322 | |
| 323 | - if ( isset( $format_parts[1] ) && $format_parts[1] ) { |
|
| 324 | - printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] ); |
|
| 323 | + if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) { |
|
| 324 | + printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] ); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | } |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | * @param array $args Optional arguments array |
| 335 | 335 | */ |
| 336 | 336 | function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) { |
| 337 | - if ( ! isset( $args['echo'] ) || $args['echo'] ) { |
|
| 337 | + if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) { |
|
| 338 | 338 | cmb2_print_metabox_form( $meta_box, $object_id, $args ); |
| 339 | 339 | } else { |
| 340 | 340 | return cmb2_get_metabox_form( $meta_box, $object_id, $args ); |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | $schedule_format = str_replace( |
| 358 | 358 | array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ), |
| 359 | - array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
| 359 | + array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
| 360 | 360 | $date_format |
| 361 | 361 | ); |
| 362 | 362 | |
@@ -373,14 +373,14 @@ discard block |
||
| 373 | 373 | * 4 or 2 characters, as needed |
| 374 | 374 | */ |
| 375 | 375 | '%04d-%02d-%02d %02d:%02d:%02d', |
| 376 | - $parsed_time['tm_year'] + 1900, // This will be "111", so we need to add 1900. |
|
| 377 | - $parsed_time['tm_mon'] + 1, // This will be the month minus one, so we add one. |
|
| 378 | - $parsed_time['tm_mday'], |
|
| 379 | - $parsed_time['tm_hour'], |
|
| 380 | - $parsed_time['tm_min'], |
|
| 381 | - $parsed_time['tm_sec'] |
|
| 376 | + $parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900. |
|
| 377 | + $parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one. |
|
| 378 | + $parsed_time[ 'tm_mday' ], |
|
| 379 | + $parsed_time[ 'tm_hour' ], |
|
| 380 | + $parsed_time[ 'tm_min' ], |
|
| 381 | + $parsed_time[ 'tm_sec' ] |
|
| 382 | 382 | ); |
| 383 | 383 | |
| 384 | - return new DateTime($ymd); |
|
| 384 | + return new DateTime( $ymd ); |
|
| 385 | 385 | } |
| 386 | 386 | } |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | public function oembed_handler() { |
| 60 | 60 | |
| 61 | 61 | // Verify our nonce |
| 62 | - if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) { |
|
| 62 | + if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) { |
|
| 63 | 63 | die(); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // Sanitize our search string |
| 67 | - $oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] ); |
|
| 67 | + $oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] ); |
|
| 68 | 68 | |
| 69 | 69 | // Send back error if empty |
| 70 | 70 | if ( empty( $oembed_string ) ) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Set width of embed |
| 75 | - $embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640'; |
|
| 75 | + $embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640'; |
|
| 76 | 76 | |
| 77 | 77 | // Set url |
| 78 | 78 | $oembed_url = esc_url( $oembed_string ); |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | // Get embed code (or fallback link) |
| 86 | 86 | $html = $this->get_oembed( array( |
| 87 | 87 | 'url' => $oembed_url, |
| 88 | - 'object_id' => $_REQUEST['object_id'], |
|
| 89 | - 'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post', |
|
| 88 | + 'object_id' => $_REQUEST[ 'object_id' ], |
|
| 89 | + 'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post', |
|
| 90 | 90 | 'oembed_args' => $embed_args, |
| 91 | - 'field_id' => $_REQUEST['field_id'], |
|
| 91 | + 'field_id' => $_REQUEST[ 'field_id' ], |
|
| 92 | 92 | ) ); |
| 93 | 93 | |
| 94 | 94 | wp_send_json_success( $html ); |
@@ -103,10 +103,10 @@ discard block |
||
| 103 | 103 | public function get_oembed_no_edit( $args ) { |
| 104 | 104 | global $wp_embed; |
| 105 | 105 | |
| 106 | - $oembed_url = esc_url( $args['url'] ); |
|
| 106 | + $oembed_url = esc_url( $args[ 'url' ] ); |
|
| 107 | 107 | |
| 108 | 108 | // Sanitize object_id |
| 109 | - $this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] ); |
|
| 109 | + $this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] ); |
|
| 110 | 110 | |
| 111 | 111 | $args = wp_parse_args( $args, array( |
| 112 | 112 | 'object_type' => 'post', |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | 'wp_error' => false, |
| 116 | 116 | ) ); |
| 117 | 117 | |
| 118 | - $this->embed_args =& $args; |
|
| 118 | + $this->embed_args = & $args; |
|
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * Set the post_ID so oEmbed won't fail |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | $wp_embed->post_ID = $this->object_id; |
| 125 | 125 | |
| 126 | 126 | // Special scenario if NOT a post object |
| 127 | - if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) { |
|
| 127 | + if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) { |
|
| 128 | 128 | |
| 129 | - if ( 'options-page' == $args['object_type'] ) { |
|
| 129 | + if ( 'options-page' == $args[ 'object_type' ] ) { |
|
| 130 | 130 | |
| 131 | 131 | // Bogus id to pass some numeric checks. Issue with a VERY large WP install? |
| 132 | 132 | $wp_embed->post_ID = 1987645321; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | // Ok, we need to hijack the oembed cache system |
| 136 | 136 | $this->hijack = true; |
| 137 | - $this->object_type = $args['object_type']; |
|
| 137 | + $this->object_type = $args[ 'object_type' ]; |
|
| 138 | 138 | |
| 139 | 139 | // Gets ombed cache from our object's meta (vs postmeta) |
| 140 | 140 | add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 ); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $embed_args = ''; |
| 148 | 148 | |
| 149 | - foreach ( $args['oembed_args'] as $key => $val ) { |
|
| 149 | + foreach ( $args[ 'oembed_args' ] as $key => $val ) { |
|
| 150 | 150 | $embed_args .= " $key=\"$val\""; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | $oembed = $this->get_oembed_no_edit( $args ); |
| 170 | 170 | |
| 171 | 171 | // Send back our embed |
| 172 | - if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) { |
|
| 173 | - return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 172 | + if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) { |
|
| 173 | + return '<div class="cmb2-oembed embed-status">' . $oembed[ 'embed' ] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed[ 'args' ][ 'field_id' ] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // Otherwise, send back error info that no oEmbeds were found |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | sprintf( |
| 180 | 180 | /* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */ |
| 181 | 181 | esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ), |
| 182 | - $oembed['fallback'], |
|
| 182 | + $oembed[ 'fallback' ], |
|
| 183 | 183 | '<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' |
| 184 | 184 | ) |
| 185 | 185 | ); |
@@ -244,15 +244,15 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function cache_action( $meta_key ) { |
| 246 | 246 | $func_args = func_get_args(); |
| 247 | - $action = isset( $func_args[1] ) ? 'update' : 'get'; |
|
| 247 | + $action = isset( $func_args[ 1 ] ) ? 'update' : 'get'; |
|
| 248 | 248 | |
| 249 | 249 | if ( 'options-page' === $this->object_type ) { |
| 250 | 250 | |
| 251 | 251 | $args = array( $meta_key ); |
| 252 | 252 | |
| 253 | 253 | if ( 'update' === $action ) { |
| 254 | - $args[] = $func_args[1]; |
|
| 255 | - $args[] = true; |
|
| 254 | + $args[ ] = $func_args[ 1 ]; |
|
| 255 | + $args[ ] = true; |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | // Cache the result to our options |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | } else { |
| 261 | 261 | |
| 262 | 262 | $args = array( $this->object_type, $this->object_id, $meta_key ); |
| 263 | - $args[] = 'update' === $action ? $func_args : true; |
|
| 263 | + $args[ ] = 'update' === $action ? $func_args : true; |
|
| 264 | 264 | |
| 265 | 265 | // Cache the result to our metadata |
| 266 | 266 | $status = call_user_func_array( $action . '_metadata', $args ); |
@@ -56,23 +56,23 @@ |
||
| 56 | 56 | $min = $debug ? '' : '.min'; |
| 57 | 57 | |
| 58 | 58 | // if colorpicker |
| 59 | - if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) { |
|
| 59 | + if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) { |
|
| 60 | 60 | self::colorpicker_frontend(); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // if file/file_list |
| 64 | - if ( isset( $dependencies['media-editor'] ) ) { |
|
| 64 | + if ( isset( $dependencies[ 'media-editor' ] ) ) { |
|
| 65 | 65 | wp_enqueue_media(); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // if timepicker |
| 69 | - if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) { |
|
| 69 | + if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) { |
|
| 70 | 70 | wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION ); |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | // if cmb2-wysiwyg |
| 74 | - $enqueue_wysiwyg = isset( $dependencies['cmb2-wysiwyg'] ) && $debug; |
|
| 75 | - unset( $dependencies['cmb2-wysiwyg'] ); |
|
| 74 | + $enqueue_wysiwyg = isset( $dependencies[ 'cmb2-wysiwyg' ] ) && $debug; |
|
| 75 | + unset( $dependencies[ 'cmb2-wysiwyg' ] ); |
|
| 76 | 76 | |
| 77 | 77 | // Enqueue cmb JS |
| 78 | 78 | wp_enqueue_script( self::$handle, cmb2_utils()->url( "js/cmb2{$min}.js" ), $dependencies, CMB2_VERSION, true ); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | ) ); |
| 29 | 29 | |
| 30 | 30 | if ( ! $field->group ) { |
| 31 | - return $this->rendered( $this->get_wp_editor( $a ) . $a['desc'] ); |
|
| 31 | + return $this->rendered( $this->get_wp_editor( $a ) . $a[ 'desc' ] ); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // wysiwyg fields in a group need some special handling. |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | protected function get_wp_editor( $args ) { |
| 54 | 54 | ob_start(); |
| 55 | - wp_editor( $args['value'], $args['id'], $args['options'] ); |
|
| 55 | + wp_editor( $args[ 'value' ], $args[ 'id' ], $args[ 'options' ] ); |
|
| 56 | 56 | return ob_get_clean(); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $group_id = $this->field->group->id(); |
| 61 | 61 | $field_id = $this->field->id( true ); |
| 62 | 62 | $options = $this->field->options(); |
| 63 | - $options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id; |
|
| 63 | + $options[ 'textarea_name' ] = 'cmb2_n_' . $group_id . $field_id; |
|
| 64 | 64 | |
| 65 | 65 | // Initate the editor with special id/value/name so we can retrieve the options in JS. |
| 66 | 66 | $editor = $this->get_wp_editor( array( |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | // And put the editor instance in a JS template wrapper. |
| 84 | 84 | echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">'; |
| 85 | 85 | // Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows. |
| 86 | - echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $field_id .'">'. $editor .'</div>'; |
|
| 86 | + echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '">' . $editor . '</div>'; |
|
| 87 | 87 | echo '</script>'; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -28,10 +28,10 @@ |
||
| 28 | 28 | return $this->rendered( |
| 29 | 29 | sprintf( |
| 30 | 30 | '<%1$s %2$s>%3$s</%1$s>%4$s', |
| 31 | - $a['tag'], |
|
| 31 | + $a[ 'tag' ], |
|
| 32 | 32 | $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), |
| 33 | - $a['name'], |
|
| 34 | - $a['desc'] |
|
| 33 | + $a[ 'name' ], |
|
| 34 | + $a[ 'desc' ] |
|
| 35 | 35 | ) |
| 36 | 36 | ); |
| 37 | 37 | } |
@@ -113,19 +113,19 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function __construct( $config, $object_id = 0 ) { |
| 115 | 115 | |
| 116 | - if ( empty( $config['id'] ) ) { |
|
| 116 | + if ( empty( $config[ 'id' ] ) ) { |
|
| 117 | 117 | wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) ); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | $this->meta_box = wp_parse_args( $config, $this->mb_defaults ); |
| 121 | - $this->meta_box['fields'] = array(); |
|
| 121 | + $this->meta_box[ 'fields' ] = array(); |
|
| 122 | 122 | |
| 123 | 123 | $this->object_id( $object_id ); |
| 124 | 124 | $this->mb_object_type(); |
| 125 | - $this->cmb_id = $config['id']; |
|
| 125 | + $this->cmb_id = $config[ 'id' ]; |
|
| 126 | 126 | |
| 127 | - if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) { |
|
| 128 | - $this->add_fields( $config['fields'] ); |
|
| 127 | + if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) { |
|
| 128 | + $this->add_fields( $config[ 'fields' ] ); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | CMB2_Boxes::add( $this ); |
@@ -294,22 +294,22 @@ discard block |
||
| 294 | 294 | * @return mixed CMB2_Field object if successful. |
| 295 | 295 | */ |
| 296 | 296 | public function render_field( $field_args ) { |
| 297 | - $field_args['context'] = $this->prop( 'context' ); |
|
| 297 | + $field_args[ 'context' ] = $this->prop( 'context' ); |
|
| 298 | 298 | |
| 299 | - if ( 'group' == $field_args['type'] ) { |
|
| 299 | + if ( 'group' == $field_args[ 'type' ] ) { |
|
| 300 | 300 | |
| 301 | - if ( ! isset( $field_args['show_names'] ) ) { |
|
| 302 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 301 | + if ( ! isset( $field_args[ 'show_names' ] ) ) { |
|
| 302 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 303 | 303 | } |
| 304 | 304 | $field = $this->render_group( $field_args ); |
| 305 | 305 | |
| 306 | - } elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) { |
|
| 306 | + } elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) { |
|
| 307 | 307 | // Save rendering for after the metabox |
| 308 | 308 | $field = $this->add_hidden_field( $field_args ); |
| 309 | 309 | |
| 310 | 310 | } else { |
| 311 | 311 | |
| 312 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 312 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 313 | 313 | |
| 314 | 314 | // Render default fields |
| 315 | 315 | $field = $this->get_field( $field_args )->render_field(); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public function render_group( $args ) { |
| 327 | 327 | |
| 328 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
| 328 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 329 | 329 | return; |
| 330 | 330 | } |
| 331 | 331 | |
@@ -427,15 +427,15 @@ discard block |
||
| 427 | 427 | <div class="inside cmb-td cmb-nested cmb-field-list">'; |
| 428 | 428 | // Loop and render repeatable group fields |
| 429 | 429 | foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) { |
| 430 | - if ( 'hidden' == $field_args['type'] ) { |
|
| 430 | + if ( 'hidden' == $field_args[ 'type' ] ) { |
|
| 431 | 431 | |
| 432 | 432 | // Save rendering for after the metabox |
| 433 | 433 | $this->add_hidden_field( $field_args, $field_group ); |
| 434 | 434 | |
| 435 | 435 | } else { |
| 436 | 436 | |
| 437 | - $field_args['show_names'] = $field_group->args( 'show_names' ); |
|
| 438 | - $field_args['context'] = $field_group->args( 'context' ); |
|
| 437 | + $field_args[ 'show_names' ] = $field_group->args( 'show_names' ); |
|
| 438 | + $field_args[ 'context' ] = $field_group->args( 'context' ); |
|
| 439 | 439 | |
| 440 | 440 | $field = $this->get_field( $field_args, $field_group )->render_field(); |
| 441 | 441 | } |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | * @param array $field_args Array of field arguments to be passed to CMB2_Field |
| 464 | 464 | */ |
| 465 | 465 | public function add_hidden_field( $field_args, $field_group = null ) { |
| 466 | - if ( isset( $field_args['field_args'] ) ) { |
|
| 466 | + if ( isset( $field_args[ 'field_args' ] ) ) { |
|
| 467 | 467 | // For back-compatibility. |
| 468 | 468 | $field = new CMB2_Field( $field_args ); |
| 469 | 469 | } else { |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | $type->iterator = $field_group->index; |
| 477 | 477 | } |
| 478 | 478 | |
| 479 | - $this->hidden_fields[] = $type; |
|
| 479 | + $this->hidden_fields[ ] = $type; |
|
| 480 | 480 | |
| 481 | 481 | return $field; |
| 482 | 482 | } |
@@ -573,11 +573,11 @@ discard block |
||
| 573 | 573 | */ |
| 574 | 574 | public function process_field( $field_args ) { |
| 575 | 575 | |
| 576 | - switch ( $field_args['type'] ) { |
|
| 576 | + switch ( $field_args[ 'type' ] ) { |
|
| 577 | 577 | |
| 578 | 578 | case 'group': |
| 579 | 579 | if ( $this->save_group( $field_args ) ) { |
| 580 | - $this->updated[] = $field_args['id']; |
|
| 580 | + $this->updated[ ] = $field_args[ 'id' ]; |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | break; |
@@ -591,7 +591,7 @@ discard block |
||
| 591 | 591 | $field = $this->get_new_field( $field_args ); |
| 592 | 592 | |
| 593 | 593 | if ( $field->save_field_from_data( $this->data_to_save ) ) { |
| 594 | - $this->updated[] = $field->id(); |
|
| 594 | + $this->updated[ ] = $field->id(); |
|
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | break; |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | * @return mixed Return of CMB2_Field::update_data() |
| 659 | 659 | */ |
| 660 | 660 | public function save_group( $args ) { |
| 661 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
| 661 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 662 | 662 | return; |
| 663 | 663 | } |
| 664 | 664 | |
@@ -706,16 +706,16 @@ discard block |
||
| 706 | 706 | $_new_val = array(); |
| 707 | 707 | foreach ( $new_val as $group_index => $grouped_data ) { |
| 708 | 708 | // Add the supporting data to the $saved array stack |
| 709 | - $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value']; |
|
| 709 | + $saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ]; |
|
| 710 | 710 | // Reset var to the actual value |
| 711 | - $_new_val[ $group_index ] = $grouped_data['value']; |
|
| 711 | + $_new_val[ $group_index ] = $grouped_data[ 'value' ]; |
|
| 712 | 712 | } |
| 713 | 713 | $new_val = $_new_val; |
| 714 | 714 | } else { |
| 715 | 715 | // Add the supporting data to the $saved array stack |
| 716 | - $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value']; |
|
| 716 | + $saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ]; |
|
| 717 | 717 | // Reset var to the actual value |
| 718 | - $new_val = $new_val['value']; |
|
| 718 | + $new_val = $new_val[ 'value' ]; |
|
| 719 | 719 | } |
| 720 | 720 | } |
| 721 | 721 | |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | |
| 730 | 730 | // Compare values and add to `$updated` array |
| 731 | 731 | if ( $is_updated || $is_removed ) { |
| 732 | - $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 732 | + $this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 733 | 733 | } |
| 734 | 734 | |
| 735 | 735 | // Add to `$saved` array |
@@ -766,22 +766,22 @@ discard block |
||
| 766 | 766 | // Try to get our object ID from the global space |
| 767 | 767 | switch ( $this->object_type() ) { |
| 768 | 768 | case 'user': |
| 769 | - $object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id; |
|
| 770 | - $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id; |
|
| 769 | + $object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id; |
|
| 770 | + $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id; |
|
| 771 | 771 | break; |
| 772 | 772 | |
| 773 | 773 | case 'comment': |
| 774 | - $object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id; |
|
| 775 | - $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id; |
|
| 774 | + $object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id; |
|
| 775 | + $object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id; |
|
| 776 | 776 | break; |
| 777 | 777 | |
| 778 | 778 | case 'term': |
| 779 | - $object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id; |
|
| 779 | + $object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id; |
|
| 780 | 780 | break; |
| 781 | 781 | |
| 782 | 782 | default: |
| 783 | - $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id; |
|
| 784 | - $object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id; |
|
| 783 | + $object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id; |
|
| 784 | + $object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id; |
|
| 785 | 785 | break; |
| 786 | 786 | } |
| 787 | 787 | |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | * @return boolean True/False |
| 858 | 858 | */ |
| 859 | 859 | public function is_options_page_mb() { |
| 860 | - 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'] ) ); |
|
| 860 | + 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' ] ) ); |
|
| 861 | 861 | } |
| 862 | 862 | |
| 863 | 863 | /** |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | return $field; |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | - $field_id = is_string( $field ) ? $field : $field['id']; |
|
| 947 | + $field_id = is_string( $field ) ? $field : $field[ 'id' ]; |
|
| 948 | 948 | |
| 949 | 949 | $parent_field_id = ! empty( $field_group ) ? $field_group->id() : ''; |
| 950 | 950 | $ids = $this->get_field_ids( $field_id, $parent_field_id, true ); |
@@ -980,16 +980,16 @@ discard block |
||
| 980 | 980 | if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) { |
| 981 | 981 | |
| 982 | 982 | // Update the fields array w/ any modified properties inherited from the group field |
| 983 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args; |
|
| 983 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args; |
|
| 984 | 984 | |
| 985 | 985 | return $this->get_default_args( $field_args, $field_group ); |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | if ( is_array( $field_args ) ) { |
| 989 | - $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] ); |
|
| 989 | + $this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 990 | 990 | } |
| 991 | 991 | |
| 992 | - return $this->get_default_args( $this->meta_box['fields'][ $field_id ] ); |
|
| 992 | + return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 993 | 993 | } |
| 994 | 994 | |
| 995 | 995 | /** |
@@ -1039,8 +1039,8 @@ discard block |
||
| 1039 | 1039 | |
| 1040 | 1040 | $sub_fields = false; |
| 1041 | 1041 | if ( array_key_exists( 'fields', $field ) ) { |
| 1042 | - $sub_fields = $field['fields']; |
|
| 1043 | - unset( $field['fields'] ); |
|
| 1042 | + $sub_fields = $field[ 'fields' ]; |
|
| 1043 | + unset( $field[ 'fields' ] ); |
|
| 1044 | 1044 | } |
| 1045 | 1045 | |
| 1046 | 1046 | $field_id = $parent_field_id |
@@ -1065,26 +1065,26 @@ discard block |
||
| 1065 | 1065 | return false; |
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | - if ( 'oembed' === $field['type'] ) { |
|
| 1068 | + if ( 'oembed' === $field[ 'type' ] ) { |
|
| 1069 | 1069 | // Initiate oembed Ajax hooks |
| 1070 | 1070 | cmb2_ajax(); |
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | - if ( isset( $field['column'] ) && false !== $field['column'] ) { |
|
| 1073 | + if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) { |
|
| 1074 | 1074 | $field = $this->define_field_column( $field ); |
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | - if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) { |
|
| 1078 | - $this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy']; |
|
| 1077 | + if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) { |
|
| 1078 | + $this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ]; |
|
| 1079 | 1079 | } |
| 1080 | 1080 | |
| 1081 | 1081 | $this->_add_field_to_array( |
| 1082 | 1082 | $field, |
| 1083 | - $this->meta_box['fields'], |
|
| 1083 | + $this->meta_box[ 'fields' ], |
|
| 1084 | 1084 | $position |
| 1085 | 1085 | ); |
| 1086 | 1086 | |
| 1087 | - return $field['id']; |
|
| 1087 | + return $field[ 'id' ]; |
|
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | 1090 | /** |
@@ -1096,10 +1096,10 @@ discard block |
||
| 1096 | 1096 | protected function define_field_column( array $field ) { |
| 1097 | 1097 | $this->has_columns = true; |
| 1098 | 1098 | |
| 1099 | - $column = is_array( $field['column'] ) ? $field['column'] : array(); |
|
| 1099 | + $column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array(); |
|
| 1100 | 1100 | |
| 1101 | - $field['column'] = wp_parse_args( $column, array( |
|
| 1102 | - 'name' => isset( $field['name'] ) ? $field['name'] : '', |
|
| 1101 | + $field[ 'column' ] = wp_parse_args( $column, array( |
|
| 1102 | + 'name' => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '', |
|
| 1103 | 1103 | 'position' => false, |
| 1104 | 1104 | ) ); |
| 1105 | 1105 | |
@@ -1115,27 +1115,27 @@ discard block |
||
| 1115 | 1115 | * @return mixed Array of parent/field ids or false |
| 1116 | 1116 | */ |
| 1117 | 1117 | public function add_group_field( $parent_field_id, array $field, $position = 0 ) { |
| 1118 | - if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) { |
|
| 1118 | + if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) { |
|
| 1119 | 1119 | return false; |
| 1120 | 1120 | } |
| 1121 | 1121 | |
| 1122 | - $parent_field = $this->meta_box['fields'][ $parent_field_id ]; |
|
| 1122 | + $parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ]; |
|
| 1123 | 1123 | |
| 1124 | - if ( 'group' !== $parent_field['type'] ) { |
|
| 1124 | + if ( 'group' !== $parent_field[ 'type' ] ) { |
|
| 1125 | 1125 | return false; |
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | - if ( ! isset( $parent_field['fields'] ) ) { |
|
| 1129 | - $this->meta_box['fields'][ $parent_field_id ]['fields'] = array(); |
|
| 1128 | + if ( ! isset( $parent_field[ 'fields' ] ) ) { |
|
| 1129 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array(); |
|
| 1130 | 1130 | } |
| 1131 | 1131 | |
| 1132 | 1132 | $this->_add_field_to_array( |
| 1133 | 1133 | $field, |
| 1134 | - $this->meta_box['fields'][ $parent_field_id ]['fields'], |
|
| 1134 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ], |
|
| 1135 | 1135 | $position |
| 1136 | 1136 | ); |
| 1137 | 1137 | |
| 1138 | - return array( $parent_field_id, $field['id'] ); |
|
| 1138 | + return array( $parent_field_id, $field[ 'id' ] ); |
|
| 1139 | 1139 | } |
| 1140 | 1140 | |
| 1141 | 1141 | /** |
@@ -1147,9 +1147,9 @@ discard block |
||
| 1147 | 1147 | */ |
| 1148 | 1148 | protected function _add_field_to_array( $field, &$fields, $position = 0 ) { |
| 1149 | 1149 | if ( $position ) { |
| 1150 | - CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position ); |
|
| 1150 | + CMB2_Utils::array_insert( $fields, array( $field[ 'id' ] => $field ), $position ); |
|
| 1151 | 1151 | } else { |
| 1152 | - $fields[ $field['id'] ] = $field; |
|
| 1152 | + $fields[ $field[ 'id' ] ] = $field; |
|
| 1153 | 1153 | } |
| 1154 | 1154 | } |
| 1155 | 1155 | |
@@ -1172,15 +1172,15 @@ discard block |
||
| 1172 | 1172 | unset( $this->fields[ implode( '', $ids ) ] ); |
| 1173 | 1173 | |
| 1174 | 1174 | if ( ! $sub_field_id ) { |
| 1175 | - unset( $this->meta_box['fields'][ $field_id ] ); |
|
| 1175 | + unset( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 1176 | 1176 | return true; |
| 1177 | 1177 | } |
| 1178 | 1178 | |
| 1179 | - if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) { |
|
| 1180 | - unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ); |
|
| 1179 | + if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) { |
|
| 1180 | + unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ); |
|
| 1181 | 1181 | } |
| 1182 | - if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) { |
|
| 1183 | - unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ); |
|
| 1182 | + if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) { |
|
| 1183 | + unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ); |
|
| 1184 | 1184 | } |
| 1185 | 1185 | return true; |
| 1186 | 1186 | } |
@@ -1204,11 +1204,11 @@ discard block |
||
| 1204 | 1204 | list( $field_id, $sub_field_id ) = $ids; |
| 1205 | 1205 | |
| 1206 | 1206 | if ( ! $sub_field_id ) { |
| 1207 | - $this->meta_box['fields'][ $field_id ][ $property ] = $value; |
|
| 1207 | + $this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value; |
|
| 1208 | 1208 | return $field_id; |
| 1209 | 1209 | } |
| 1210 | 1210 | |
| 1211 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value; |
|
| 1211 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value; |
|
| 1212 | 1212 | return $field_id; |
| 1213 | 1213 | } |
| 1214 | 1214 | |
@@ -1222,7 +1222,7 @@ discard block |
||
| 1222 | 1222 | public function get_field_ids( $field_id, $parent_field_id = '' ) { |
| 1223 | 1223 | $sub_field_id = $parent_field_id ? $field_id : ''; |
| 1224 | 1224 | $field_id = $parent_field_id ? $parent_field_id : $field_id; |
| 1225 | - $fields =& $this->meta_box['fields']; |
|
| 1225 | + $fields = & $this->meta_box[ 'fields' ]; |
|
| 1226 | 1226 | |
| 1227 | 1227 | if ( ! array_key_exists( $field_id, $fields ) ) { |
| 1228 | 1228 | $field_id = $this->search_old_school_array( $field_id, $fields ); |
@@ -1236,12 +1236,12 @@ discard block |
||
| 1236 | 1236 | return array( $field_id, $sub_field_id ); |
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | - if ( 'group' !== $fields[ $field_id ]['type'] ) { |
|
| 1239 | + if ( 'group' !== $fields[ $field_id ][ 'type' ] ) { |
|
| 1240 | 1240 | return false; |
| 1241 | 1241 | } |
| 1242 | 1242 | |
| 1243 | - if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) { |
|
| 1244 | - $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] ); |
|
| 1243 | + if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) { |
|
| 1244 | + $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] ); |
|
| 1245 | 1245 | } |
| 1246 | 1246 | |
| 1247 | 1247 | return false === $sub_field_id ? false : array( $field_id, $sub_field_id ); |