@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $cmb_demo = new_cmb2_box( array( |
| 79 | 79 | 'id' => $prefix . 'metabox', |
| 80 | 80 | 'title' => __( 'Test Metabox', 'cmb2' ), |
| 81 | - 'object_types' => array( 'page', ), // Post type |
|
| 81 | + 'object_types' => array( 'page',), // Post type |
|
| 82 | 82 | // 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value |
| 83 | 83 | // 'context' => 'normal', |
| 84 | 84 | // 'priority' => 'high', |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | 'desc' => __( 'field description (optional)', 'cmb2' ), |
| 330 | 330 | 'id' => $prefix . 'wysiwyg', |
| 331 | 331 | 'type' => 'wysiwyg', |
| 332 | - 'options' => array( 'textarea_rows' => 5, ), |
|
| 332 | + 'options' => array( 'textarea_rows' => 5,), |
|
| 333 | 333 | ) ); |
| 334 | 334 | |
| 335 | 335 | $cmb_demo->add_field( array( |
@@ -381,11 +381,11 @@ discard block |
||
| 381 | 381 | $cmb_about_page = new_cmb2_box( array( |
| 382 | 382 | 'id' => $prefix . 'metabox', |
| 383 | 383 | 'title' => __( 'About Page Metabox', 'cmb2' ), |
| 384 | - 'object_types' => array( 'page', ), // Post type |
|
| 384 | + 'object_types' => array( 'page',), // Post type |
|
| 385 | 385 | 'context' => 'normal', |
| 386 | 386 | 'priority' => 'high', |
| 387 | 387 | 'show_names' => true, // Show field names on the left |
| 388 | - 'show_on' => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox |
|
| 388 | + 'show_on' => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox |
|
| 389 | 389 | ) ); |
| 390 | 390 | |
| 391 | 391 | $cmb_about_page->add_field( array( |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | $cmb_group = new_cmb2_box( array( |
| 411 | 411 | 'id' => $prefix . 'metabox', |
| 412 | 412 | 'title' => __( 'Repeating Field Group', 'cmb2' ), |
| 413 | - 'object_types' => array( 'page', ), |
|
| 413 | + 'object_types' => array( 'page',), |
|
| 414 | 414 | ) ); |
| 415 | 415 | |
| 416 | 416 | // $group_field_id is the field id string, so in this case: $prefix . 'demo' |
@@ -118,19 +118,19 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | public function __construct( $meta_box, $object_id = 0 ) { |
| 120 | 120 | |
| 121 | - if ( empty( $meta_box['id'] ) ) { |
|
| 121 | + if ( empty( $meta_box[ 'id' ] ) ) { |
|
| 122 | 122 | wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) ); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $this->meta_box = wp_parse_args( $meta_box, $this->mb_defaults ); |
| 126 | - $this->meta_box['fields'] = array(); |
|
| 126 | + $this->meta_box[ 'fields' ] = array(); |
|
| 127 | 127 | |
| 128 | 128 | $this->object_id( $object_id ); |
| 129 | 129 | $this->mb_object_type(); |
| 130 | - $this->cmb_id = $meta_box['id']; |
|
| 130 | + $this->cmb_id = $meta_box[ 'id' ]; |
|
| 131 | 131 | |
| 132 | - if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) { |
|
| 133 | - $this->add_fields( $meta_box['fields'] ); |
|
| 132 | + if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) { |
|
| 133 | + $this->add_fields( $meta_box[ 'fields' ] ); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | CMB2_Boxes::add( $this ); |
@@ -261,16 +261,16 @@ discard block |
||
| 261 | 261 | * @return mixed CMB2_Field object if successful. |
| 262 | 262 | */ |
| 263 | 263 | public function render_field( $field_args ) { |
| 264 | - $field_args['context'] = $this->prop( 'context' ); |
|
| 264 | + $field_args[ 'context' ] = $this->prop( 'context' ); |
|
| 265 | 265 | |
| 266 | - if ( 'group' == $field_args['type'] ) { |
|
| 266 | + if ( 'group' == $field_args[ 'type' ] ) { |
|
| 267 | 267 | |
| 268 | - if ( ! isset( $field_args['show_names'] ) ) { |
|
| 269 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 268 | + if ( ! isset( $field_args[ 'show_names' ] ) ) { |
|
| 269 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 270 | 270 | } |
| 271 | 271 | $field = $this->render_group( $field_args ); |
| 272 | 272 | |
| 273 | - } elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) { |
|
| 273 | + } elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) { |
|
| 274 | 274 | // Save rendering for after the metabox |
| 275 | 275 | $field = $this->add_hidden_field( array( |
| 276 | 276 | 'field_args' => $field_args, |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | |
| 281 | 281 | } else { |
| 282 | 282 | |
| 283 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 283 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 284 | 284 | |
| 285 | 285 | // Render default fields |
| 286 | 286 | $field = $this->get_field( $field_args )->render_field(); |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | public function render_group( $args ) { |
| 298 | 298 | |
| 299 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
| 299 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 300 | 300 | return; |
| 301 | 301 | } |
| 302 | 302 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | <div class="inside cmb-td cmb-nested cmb-field-list">'; |
| 379 | 379 | // Loop and render repeatable group fields |
| 380 | 380 | foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) { |
| 381 | - if ( 'hidden' == $field_args['type'] ) { |
|
| 381 | + if ( 'hidden' == $field_args[ 'type' ] ) { |
|
| 382 | 382 | |
| 383 | 383 | // Save rendering for after the metabox |
| 384 | 384 | $this->add_hidden_field( array( |
@@ -388,8 +388,8 @@ discard block |
||
| 388 | 388 | |
| 389 | 389 | } else { |
| 390 | 390 | |
| 391 | - $field_args['show_names'] = $field_group->args( 'show_names' ); |
|
| 392 | - $field_args['context'] = $field_group->args( 'context' ); |
|
| 391 | + $field_args[ 'show_names' ] = $field_group->args( 'show_names' ); |
|
| 392 | + $field_args[ 'context' ] = $field_group->args( 'context' ); |
|
| 393 | 393 | |
| 394 | 394 | $field = $this->get_field( $field_args, $field_group )->render_field(); |
| 395 | 395 | } |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | */ |
| 419 | 419 | public function add_hidden_field( $args ) { |
| 420 | 420 | $field = new CMB2_Field( $args ); |
| 421 | - $this->hidden_fields[] = new CMB2_Types( $field ); |
|
| 421 | + $this->hidden_fields[ ] = new CMB2_Types( $field ); |
|
| 422 | 422 | |
| 423 | 423 | return $field; |
| 424 | 424 | } |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | */ |
| 558 | 558 | public function process_field( $field_args ) { |
| 559 | 559 | |
| 560 | - switch ( $field_args['type'] ) { |
|
| 560 | + switch ( $field_args[ 'type' ] ) { |
|
| 561 | 561 | |
| 562 | 562 | case 'group': |
| 563 | 563 | $this->save_group( $field_args ); |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | ) ); |
| 578 | 578 | |
| 579 | 579 | if ( $field->save_field_from_data( $this->data_to_save ) ) { |
| 580 | - $this->updated[] = $field->id(); |
|
| 580 | + $this->updated[ ] = $field->id(); |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | break; |
@@ -590,11 +590,11 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | public function save_group( $args ) { |
| 592 | 592 | |
| 593 | - if ( ! isset( $args['id'], $args['fields'], $this->data_to_save[ $args['id'] ] ) || ! is_array( $args['fields'] ) ) { |
|
| 593 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ], $this->data_to_save[ $args[ 'id' ] ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 594 | 594 | return; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - $field_group = new CMB2_Field( array( |
|
| 597 | + $field_group = new CMB2_Field( array( |
|
| 598 | 598 | 'field_args' => $args, |
| 599 | 599 | 'object_type' => $this->object_type(), |
| 600 | 600 | 'object_id' => $this->object_id(), |
@@ -629,16 +629,16 @@ discard block |
||
| 629 | 629 | $_new_val = array(); |
| 630 | 630 | foreach ( $new_val as $group_index => $grouped_data ) { |
| 631 | 631 | // Add the supporting data to the $saved array stack |
| 632 | - $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value']; |
|
| 632 | + $saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ]; |
|
| 633 | 633 | // Reset var to the actual value |
| 634 | - $_new_val[ $group_index ] = $grouped_data['value']; |
|
| 634 | + $_new_val[ $group_index ] = $grouped_data[ 'value' ]; |
|
| 635 | 635 | } |
| 636 | 636 | $new_val = $_new_val; |
| 637 | 637 | } else { |
| 638 | 638 | // Add the supporting data to the $saved array stack |
| 639 | - $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value']; |
|
| 639 | + $saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ]; |
|
| 640 | 640 | // Reset var to the actual value |
| 641 | - $new_val = $new_val['value']; |
|
| 641 | + $new_val = $new_val[ 'value' ]; |
|
| 642 | 642 | } |
| 643 | 643 | } |
| 644 | 644 | |
@@ -651,7 +651,7 @@ discard block |
||
| 651 | 651 | $is_removed = ( empty( $new_val ) && ! empty( $old_val ) ); |
| 652 | 652 | // Compare values and add to `$updated` array |
| 653 | 653 | if ( $is_updated || $is_removed ) { |
| 654 | - $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 654 | + $this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 655 | 655 | } |
| 656 | 656 | |
| 657 | 657 | // Add to `$saved` array |
@@ -686,22 +686,22 @@ discard block |
||
| 686 | 686 | // Try to get our object ID from the global space |
| 687 | 687 | switch ( $this->object_type() ) { |
| 688 | 688 | case 'user': |
| 689 | - $object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id; |
|
| 690 | - $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id; |
|
| 689 | + $object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id; |
|
| 690 | + $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id; |
|
| 691 | 691 | break; |
| 692 | 692 | |
| 693 | 693 | case 'comment': |
| 694 | - $object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id; |
|
| 695 | - $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id; |
|
| 694 | + $object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id; |
|
| 695 | + $object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id; |
|
| 696 | 696 | break; |
| 697 | 697 | |
| 698 | 698 | case 'term': |
| 699 | - $object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id; |
|
| 699 | + $object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id; |
|
| 700 | 700 | break; |
| 701 | 701 | |
| 702 | 702 | default: |
| 703 | - $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id; |
|
| 704 | - $object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id; |
|
| 703 | + $object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id; |
|
| 704 | + $object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id; |
|
| 705 | 705 | break; |
| 706 | 706 | } |
| 707 | 707 | |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | * @return boolean True/False |
| 774 | 774 | */ |
| 775 | 775 | public function is_options_page_mb() { |
| 776 | - 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'] ) ); |
|
| 776 | + 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' ] ) ); |
|
| 777 | 777 | } |
| 778 | 778 | |
| 779 | 779 | /** |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | return $field; |
| 840 | 840 | } |
| 841 | 841 | |
| 842 | - $field_id = is_string( $field ) ? $field : $field['id']; |
|
| 842 | + $field_id = is_string( $field ) ? $field : $field[ 'id' ]; |
|
| 843 | 843 | |
| 844 | 844 | $parent_field_id = ! empty( $field_group ) ? $field_group->id() : ''; |
| 845 | 845 | $ids = $this->get_field_ids( $field_id, $parent_field_id, true ); |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) { |
| 876 | 876 | |
| 877 | 877 | // Update the fields array w/ any modified properties inherited from the group field |
| 878 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args; |
|
| 878 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args; |
|
| 879 | 879 | |
| 880 | 880 | return array( |
| 881 | 881 | 'field_args' => $field_args, |
@@ -885,11 +885,11 @@ discard block |
||
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | if ( is_array( $field_args ) ) { |
| 888 | - $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] ); |
|
| 888 | + $this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | return array( |
| 892 | - 'field_args' => $this->meta_box['fields'][ $field_id ], |
|
| 892 | + 'field_args' => $this->meta_box[ 'fields' ][ $field_id ], |
|
| 893 | 893 | 'object_type' => $this->object_type(), |
| 894 | 894 | 'object_id' => $this->object_id(), |
| 895 | 895 | ); |
@@ -906,8 +906,8 @@ discard block |
||
| 906 | 906 | |
| 907 | 907 | $sub_fields = false; |
| 908 | 908 | if ( array_key_exists( 'fields', $field ) ) { |
| 909 | - $sub_fields = $field['fields']; |
|
| 910 | - unset( $field['fields'] ); |
|
| 909 | + $sub_fields = $field[ 'fields' ]; |
|
| 910 | + unset( $field[ 'fields' ] ); |
|
| 911 | 911 | } |
| 912 | 912 | |
| 913 | 913 | $field_id = $parent_field_id |
@@ -934,11 +934,11 @@ discard block |
||
| 934 | 934 | |
| 935 | 935 | $this->_add_field_to_array( |
| 936 | 936 | $field, |
| 937 | - $this->meta_box['fields'], |
|
| 937 | + $this->meta_box[ 'fields' ], |
|
| 938 | 938 | $position |
| 939 | 939 | ); |
| 940 | 940 | |
| 941 | - return $field['id']; |
|
| 941 | + return $field[ 'id' ]; |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | 944 | /** |
@@ -950,27 +950,27 @@ discard block |
||
| 950 | 950 | * @return mixed Array of parent/field ids or false |
| 951 | 951 | */ |
| 952 | 952 | public function add_group_field( $parent_field_id, array $field, $position = 0 ) { |
| 953 | - if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) { |
|
| 953 | + if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) { |
|
| 954 | 954 | return false; |
| 955 | 955 | } |
| 956 | 956 | |
| 957 | - $parent_field = $this->meta_box['fields'][ $parent_field_id ]; |
|
| 957 | + $parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ]; |
|
| 958 | 958 | |
| 959 | - if ( 'group' !== $parent_field['type'] ) { |
|
| 959 | + if ( 'group' !== $parent_field[ 'type' ] ) { |
|
| 960 | 960 | return false; |
| 961 | 961 | } |
| 962 | 962 | |
| 963 | - if ( ! isset( $parent_field['fields'] ) ) { |
|
| 964 | - $this->meta_box['fields'][ $parent_field_id ]['fields'] = array(); |
|
| 963 | + if ( ! isset( $parent_field[ 'fields' ] ) ) { |
|
| 964 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array(); |
|
| 965 | 965 | } |
| 966 | 966 | |
| 967 | 967 | $this->_add_field_to_array( |
| 968 | 968 | $field, |
| 969 | - $this->meta_box['fields'][ $parent_field_id ]['fields'], |
|
| 969 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ], |
|
| 970 | 970 | $position |
| 971 | 971 | ); |
| 972 | 972 | |
| 973 | - return array( $parent_field_id, $field['id'] ); |
|
| 973 | + return array( $parent_field_id, $field[ 'id' ] ); |
|
| 974 | 974 | } |
| 975 | 975 | |
| 976 | 976 | /** |
@@ -982,9 +982,9 @@ discard block |
||
| 982 | 982 | */ |
| 983 | 983 | protected function _add_field_to_array( $field, &$fields, $position = 0 ) { |
| 984 | 984 | if ( $position ) { |
| 985 | - cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position ); |
|
| 985 | + cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position ); |
|
| 986 | 986 | } else { |
| 987 | - $fields[ $field['id'] ] = $field; |
|
| 987 | + $fields[ $field[ 'id' ] ] = $field; |
|
| 988 | 988 | } |
| 989 | 989 | } |
| 990 | 990 | |
@@ -1007,12 +1007,12 @@ discard block |
||
| 1007 | 1007 | unset( $this->fields[ implode( '', $ids ) ] ); |
| 1008 | 1008 | |
| 1009 | 1009 | if ( ! $sub_field_id ) { |
| 1010 | - unset( $this->meta_box['fields'][ $field_id ] ); |
|
| 1010 | + unset( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 1011 | 1011 | return true; |
| 1012 | 1012 | } |
| 1013 | 1013 | |
| 1014 | - unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ); |
|
| 1015 | - unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ); |
|
| 1014 | + unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ); |
|
| 1015 | + unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ); |
|
| 1016 | 1016 | return true; |
| 1017 | 1017 | } |
| 1018 | 1018 | |
@@ -1035,11 +1035,11 @@ discard block |
||
| 1035 | 1035 | list( $field_id, $sub_field_id ) = $ids; |
| 1036 | 1036 | |
| 1037 | 1037 | if ( ! $sub_field_id ) { |
| 1038 | - $this->meta_box['fields'][ $field_id ][ $property ] = $value; |
|
| 1038 | + $this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value; |
|
| 1039 | 1039 | return $field_id; |
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value; |
|
| 1042 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value; |
|
| 1043 | 1043 | return $field_id; |
| 1044 | 1044 | } |
| 1045 | 1045 | |
@@ -1053,7 +1053,7 @@ discard block |
||
| 1053 | 1053 | public function get_field_ids( $field_id, $parent_field_id = '' ) { |
| 1054 | 1054 | $sub_field_id = $parent_field_id ? $field_id : ''; |
| 1055 | 1055 | $field_id = $parent_field_id ? $parent_field_id : $field_id; |
| 1056 | - $fields =& $this->meta_box['fields']; |
|
| 1056 | + $fields = & $this->meta_box[ 'fields' ]; |
|
| 1057 | 1057 | |
| 1058 | 1058 | if ( ! array_key_exists( $field_id, $fields ) ) { |
| 1059 | 1059 | $field_id = $this->search_old_school_array( $field_id, $fields ); |
@@ -1067,12 +1067,12 @@ discard block |
||
| 1067 | 1067 | return array( $field_id, $sub_field_id ); |
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | - if ( 'group' !== $fields[ $field_id ]['type'] ) { |
|
| 1070 | + if ( 'group' !== $fields[ $field_id ][ 'type' ] ) { |
|
| 1071 | 1071 | return false; |
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | - if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) { |
|
| 1075 | - $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] ); |
|
| 1074 | + if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) { |
|
| 1075 | + $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] ); |
|
| 1076 | 1076 | } |
| 1077 | 1077 | |
| 1078 | 1078 | return false === $sub_field_id ? false : array( $field_id, $sub_field_id ); |
@@ -28,12 +28,12 @@ discard block |
||
| 28 | 28 | public function oembed_handler() { |
| 29 | 29 | |
| 30 | 30 | // Verify our nonce |
| 31 | - if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) { |
|
| 31 | + if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) { |
|
| 32 | 32 | die(); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Sanitize our search string |
| 36 | - $oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] ); |
|
| 36 | + $oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] ); |
|
| 37 | 37 | |
| 38 | 38 | // Send back error if empty |
| 39 | 39 | if ( empty( $oembed_string ) ) { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // Set width of embed |
| 44 | - $embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640'; |
|
| 44 | + $embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640'; |
|
| 45 | 45 | |
| 46 | 46 | // Set url |
| 47 | 47 | $oembed_url = esc_url( $oembed_string ); |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | // Get embed code (or fallback link) |
| 55 | 55 | $html = $this->get_oembed( array( |
| 56 | 56 | 'url' => $oembed_url, |
| 57 | - 'object_id' => $_REQUEST['object_id'], |
|
| 58 | - 'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post', |
|
| 57 | + 'object_id' => $_REQUEST[ 'object_id' ], |
|
| 58 | + 'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post', |
|
| 59 | 59 | 'oembed_args' => $embed_args, |
| 60 | - 'field_id' => $_REQUEST['field_id'], |
|
| 60 | + 'field_id' => $_REQUEST[ 'field_id' ], |
|
| 61 | 61 | ) ); |
| 62 | 62 | |
| 63 | 63 | wp_send_json_success( $html ); |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | global $wp_embed; |
| 75 | 75 | |
| 76 | - $oembed_url = esc_url( $args['url'] ); |
|
| 76 | + $oembed_url = esc_url( $args[ 'url' ] ); |
|
| 77 | 77 | |
| 78 | 78 | // Sanitize object_id |
| 79 | - $this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] ); |
|
| 79 | + $this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] ); |
|
| 80 | 80 | |
| 81 | 81 | $args = wp_parse_args( $args, array( |
| 82 | 82 | 'object_type' => 'post', |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | 'cache_key' => false, |
| 86 | 86 | ) ); |
| 87 | 87 | |
| 88 | - $this->embed_args =& $args; |
|
| 88 | + $this->embed_args = & $args; |
|
| 89 | 89 | |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -95,20 +95,20 @@ discard block |
||
| 95 | 95 | $wp_embed->post_ID = $this->object_id; |
| 96 | 96 | |
| 97 | 97 | // Special scenario if NOT a post object |
| 98 | - if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) { |
|
| 98 | + if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) { |
|
| 99 | 99 | |
| 100 | - if ( 'options-page' == $args['object_type'] ) { |
|
| 100 | + if ( 'options-page' == $args[ 'object_type' ] ) { |
|
| 101 | 101 | |
| 102 | 102 | // Bogus id to pass some numeric checks. Issue with a VERY large WP install? |
| 103 | 103 | $wp_embed->post_ID = 1987645321; |
| 104 | 104 | |
| 105 | 105 | // Use our own cache key to correspond to this field (vs one cache key per url) |
| 106 | - $args['cache_key'] = $args['field_id'] . '_cache'; |
|
| 106 | + $args[ 'cache_key' ] = $args[ 'field_id' ] . '_cache'; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | // Ok, we need to hijack the oembed cache system |
| 110 | 110 | $this->hijack = true; |
| 111 | - $this->object_type = $args['object_type']; |
|
| 111 | + $this->object_type = $args[ 'object_type' ]; |
|
| 112 | 112 | |
| 113 | 113 | // Gets ombed cache from our object's meta (vs postmeta) |
| 114 | 114 | add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 ); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | $embed_args = ''; |
| 122 | 122 | |
| 123 | - foreach ( $args['oembed_args'] as $key => $val ) { |
|
| 123 | + foreach ( $args[ 'oembed_args' ] as $key => $val ) { |
|
| 124 | 124 | $embed_args .= " $key=\"$val\""; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | // Send back our embed |
| 134 | 134 | if ( $check_embed && $check_embed != $fallback ) { |
| 135 | - 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>'; |
|
| 135 | + 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>'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | // Otherwise, send back error info that no oEmbeds were found |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | // Get cached data |
| 164 | 164 | return ( 'options-page' === $this->object_type ) |
| 165 | - ? cmb2_options( $this->object_id )->get( $this->embed_args['cache_key'] ) |
|
| 165 | + ? cmb2_options( $this->object_id )->get( $this->embed_args[ 'cache_key' ] ) |
|
| 166 | 166 | : get_metadata( $this->object_type, $this->object_id, $meta_key, true ); |
| 167 | 167 | |
| 168 | 168 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | // Cache the result to our metadata |
| 203 | 203 | return ( 'options-page' !== $this->object_type ) |
| 204 | 204 | ? update_metadata( $this->object_type, $this->object_id, $meta_key, $meta_value ) |
| 205 | - : cmb2_options( $this->object_id )->update( $this->embed_args['cache_key'], $meta_value, true ); |
|
| 205 | + : cmb2_options( $this->object_id )->update( $this->embed_args[ 'cache_key' ], $meta_value, true ); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | } |
@@ -93,16 +93,16 @@ discard block |
||
| 93 | 93 | */ |
| 94 | 94 | public function __construct( $args ) { |
| 95 | 95 | |
| 96 | - if ( ! empty( $args['group_field'] ) ) { |
|
| 97 | - $this->group = $args['group_field']; |
|
| 96 | + if ( ! empty( $args[ 'group_field' ] ) ) { |
|
| 97 | + $this->group = $args[ 'group_field' ]; |
|
| 98 | 98 | $this->object_id = $this->group->object_id; |
| 99 | 99 | $this->object_type = $this->group->object_type; |
| 100 | 100 | } else { |
| 101 | - $this->object_id = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0; |
|
| 102 | - $this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post'; |
|
| 101 | + $this->object_id = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0; |
|
| 102 | + $this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post'; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $this->args = $this->_set_field_defaults( $args['field_args'] ); |
|
| 105 | + $this->args = $this->_set_field_defaults( $args[ 'field_args' ] ); |
|
| 106 | 106 | |
| 107 | 107 | if ( $this->object_id ) { |
| 108 | 108 | $this->value = $this->get_data(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * @return mixed Value of field argument |
| 118 | 118 | */ |
| 119 | 119 | public function __call( $name, $arguments ) { |
| 120 | - $key = isset( $arguments[0] ) ? $arguments[0] : false; |
|
| 120 | + $key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false; |
|
| 121 | 121 | return $this->args( $name, $key ); |
| 122 | 122 | } |
| 123 | 123 | |
@@ -188,9 +188,9 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function get_data( $field_id = '', $args = array() ) { |
| 190 | 190 | if ( $field_id ) { |
| 191 | - $args['field_id'] = $field_id; |
|
| 191 | + $args[ 'field_id' ] = $field_id; |
|
| 192 | 192 | } else if ( $this->group ) { |
| 193 | - $args['field_id'] = $this->group->id(); |
|
| 193 | + $args[ 'field_id' ] = $this->group->id(); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | $a = $this->data_args( $args ); |
@@ -231,13 +231,13 @@ discard block |
||
| 231 | 231 | * |
| 232 | 232 | * @since 2.0.0 |
| 233 | 233 | */ |
| 234 | - $data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this ); |
|
| 234 | + $data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this ); |
|
| 235 | 235 | |
| 236 | 236 | // If no override, get value normally |
| 237 | 237 | if ( 'cmb2_field_no_override_val' === $data ) { |
| 238 | - $data = 'options-page' === $a['type'] |
|
| 239 | - ? cmb2_options( $a['id'] )->get( $a['field_id'] ) |
|
| 240 | - : get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) ); |
|
| 238 | + $data = 'options-page' === $a[ 'type' ] |
|
| 239 | + ? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] ) |
|
| 240 | + : get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) ); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | if ( $this->group ) { |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | public function update_data( $new_value, $single = true ) { |
| 260 | 260 | $a = $this->data_args( array( 'single' => $single ) ); |
| 261 | 261 | |
| 262 | - $a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value; |
|
| 262 | + $a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value; |
|
| 263 | 263 | |
| 264 | 264 | /** |
| 265 | 265 | * Filter whether to override saving of meta value. |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | * |
| 296 | 296 | * @since 2.0.0 |
| 297 | 297 | */ |
| 298 | - $override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this ); |
|
| 298 | + $override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this ); |
|
| 299 | 299 | |
| 300 | 300 | // If override, return that |
| 301 | 301 | if ( null !== $override ) { |
@@ -303,22 +303,22 @@ discard block |
||
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | // Options page handling (or temp data store) |
| 306 | - if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { |
|
| 307 | - return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] ); |
|
| 306 | + if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) { |
|
| 307 | + return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] ); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | // Add metadata if not single |
| 311 | - if ( ! $a['single'] ) { |
|
| 312 | - return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false ); |
|
| 311 | + if ( ! $a[ 'single' ] ) { |
|
| 312 | + return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false ); |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | // Delete meta if we have an empty array |
| 316 | - if ( is_array( $a['value'] ) && empty( $a['value'] ) ) { |
|
| 317 | - return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value ); |
|
| 316 | + if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) { |
|
| 317 | + return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value ); |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | // Update metadata |
| 321 | - return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] ); |
|
| 321 | + return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] ); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
@@ -368,19 +368,19 @@ discard block |
||
| 368 | 368 | * @param array $field_args All field arguments |
| 369 | 369 | * @param CMB2_Field object $field This field object |
| 370 | 370 | */ |
| 371 | - $override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this ); |
|
| 371 | + $override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this ); |
|
| 372 | 372 | |
| 373 | 373 | // If no override, remove as usual |
| 374 | 374 | if ( null !== $override ) { |
| 375 | 375 | return $override; |
| 376 | 376 | } |
| 377 | 377 | // Option page handling |
| 378 | - elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { |
|
| 379 | - return cmb2_options( $a['id'] )->remove( $a['field_id'] ); |
|
| 378 | + elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) { |
|
| 379 | + return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] ); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | // Remove metadata |
| 383 | - return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old ); |
|
| 383 | + return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old ); |
|
| 384 | 384 | } |
| 385 | 385 | |
| 386 | 386 | /** |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | |
| 852 | 852 | foreach ( $conditional_classes as $class => $condition ) { |
| 853 | 853 | if ( $condition ) { |
| 854 | - $classes[] = $class; |
|
| 854 | + $classes[ ] = $class; |
|
| 855 | 855 | } |
| 856 | 856 | } |
| 857 | 857 | |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | if ( $added_classes ) { |
| 863 | - $classes[] = esc_attr( $added_classes ); |
|
| 863 | + $classes[ ] = esc_attr( $added_classes ); |
|
| 864 | 864 | } |
| 865 | 865 | |
| 866 | 866 | /** |
@@ -965,10 +965,10 @@ discard block |
||
| 965 | 965 | return $this->field_options; |
| 966 | 966 | } |
| 967 | 967 | |
| 968 | - $this->field_options = (array) $this->args['options']; |
|
| 968 | + $this->field_options = (array) $this->args[ 'options' ]; |
|
| 969 | 969 | |
| 970 | - if ( is_callable( $this->args['options_cb'] ) ) { |
|
| 971 | - $options = call_user_func( $this->args['options_cb'], $this ); |
|
| 970 | + if ( is_callable( $this->args[ 'options_cb' ] ) ) { |
|
| 971 | + $options = call_user_func( $this->args[ 'options_cb' ], $this ); |
|
| 972 | 972 | |
| 973 | 973 | if ( $options && is_array( $options ) ) { |
| 974 | 974 | $this->field_options += $options; |
@@ -1003,64 +1003,64 @@ discard block |
||
| 1003 | 1003 | 'default' => null, |
| 1004 | 1004 | 'select_all_button' => true, |
| 1005 | 1005 | 'multiple' => false, |
| 1006 | - 'repeatable' => isset( $args['type'] ) && 'group' == $args['type'], |
|
| 1006 | + 'repeatable' => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ], |
|
| 1007 | 1007 | 'inline' => false, |
| 1008 | 1008 | 'on_front' => true, |
| 1009 | 1009 | 'show_names' => true, |
| 1010 | 1010 | 'date_format' => 'm\/d\/Y', |
| 1011 | 1011 | 'time_format' => 'h:i A', |
| 1012 | - 'description' => isset( $args['desc'] ) ? $args['desc'] : '', |
|
| 1013 | - 'preview_size' => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ), |
|
| 1012 | + 'description' => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '', |
|
| 1013 | + 'preview_size' => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ), |
|
| 1014 | 1014 | 'render_row_cb' => array( $this, 'render_field_callback' ), |
| 1015 | - 'label_cb' => 'title' != $args['type'] ? array( $this, 'label' ) : '', |
|
| 1015 | + 'label_cb' => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '', |
|
| 1016 | 1016 | ) ); |
| 1017 | 1017 | |
| 1018 | 1018 | // Allow a filter override of the default value |
| 1019 | - $args['default'] = apply_filters( 'cmb2_default_filter', $args['default'], $this ); |
|
| 1020 | - $args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] ); |
|
| 1021 | - $args['inline'] = $args['inline'] || false !== stripos( $args['type'], '_inline' ); |
|
| 1019 | + $args[ 'default' ] = apply_filters( 'cmb2_default_filter', $args[ 'default' ], $this ); |
|
| 1020 | + $args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] ); |
|
| 1021 | + $args[ 'inline' ] = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' ); |
|
| 1022 | 1022 | |
| 1023 | 1023 | // options param can be passed a callback as well |
| 1024 | - if ( is_callable( $args['options'] ) ) { |
|
| 1025 | - $args['options_cb'] = $args['options']; |
|
| 1026 | - $args['options'] = array(); |
|
| 1024 | + if ( is_callable( $args[ 'options' ] ) ) { |
|
| 1025 | + $args[ 'options_cb' ] = $args[ 'options' ]; |
|
| 1026 | + $args[ 'options' ] = array(); |
|
| 1027 | 1027 | } |
| 1028 | 1028 | |
| 1029 | - $args['options'] = 'group' == $args['type'] ? wp_parse_args( $args['options'], array( |
|
| 1029 | + $args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array( |
|
| 1030 | 1030 | 'add_button' => __( 'Add Group', 'cmb2' ), |
| 1031 | 1031 | 'remove_button' => __( 'Remove Group', 'cmb2' ), |
| 1032 | - ) ) : $args['options']; |
|
| 1032 | + ) ) : $args[ 'options' ]; |
|
| 1033 | 1033 | |
| 1034 | - $args['_id'] = $args['id']; |
|
| 1035 | - $args['_name'] = $args['id']; |
|
| 1034 | + $args[ '_id' ] = $args[ 'id' ]; |
|
| 1035 | + $args[ '_name' ] = $args[ 'id' ]; |
|
| 1036 | 1036 | |
| 1037 | 1037 | if ( $this->group ) { |
| 1038 | 1038 | |
| 1039 | - $args['id'] = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id']; |
|
| 1040 | - $args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']'; |
|
| 1039 | + $args[ 'id' ] = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ]; |
|
| 1040 | + $args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']'; |
|
| 1041 | 1041 | } |
| 1042 | 1042 | |
| 1043 | - if ( 'wysiwyg' == $args['type'] ) { |
|
| 1044 | - $args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) ); |
|
| 1045 | - $args['options']['textarea_name'] = $args['_name']; |
|
| 1043 | + if ( 'wysiwyg' == $args[ 'type' ] ) { |
|
| 1044 | + $args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) ); |
|
| 1045 | + $args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ]; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | $option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this ); |
| 1049 | 1049 | |
| 1050 | - if ( in_array( $args['type'], $option_types, true ) ) { |
|
| 1050 | + if ( in_array( $args[ 'type' ], $option_types, true ) ) { |
|
| 1051 | 1051 | |
| 1052 | - $args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null; |
|
| 1053 | - $args['show_option_none'] = true === $args['show_option_none'] ? __( 'None', 'cmb2' ) : $args['show_option_none']; |
|
| 1052 | + $args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null; |
|
| 1053 | + $args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? __( 'None', 'cmb2' ) : $args[ 'show_option_none' ]; |
|
| 1054 | 1054 | |
| 1055 | - if ( null === $args['show_option_none'] ) { |
|
| 1056 | - $off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true ); |
|
| 1057 | - $args['show_option_none'] = $off_by_default ? false : __( 'None', 'cmb2' ); |
|
| 1055 | + if ( null === $args[ 'show_option_none' ] ) { |
|
| 1056 | + $off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true ); |
|
| 1057 | + $args[ 'show_option_none' ] = $off_by_default ? false : __( 'None', 'cmb2' ); |
|
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | } |
| 1061 | 1061 | |
| 1062 | - $args['has_supporting_data'] = in_array( |
|
| 1063 | - $args['type'], |
|
| 1062 | + $args[ 'has_supporting_data' ] = in_array( |
|
| 1063 | + $args[ 'type' ], |
|
| 1064 | 1064 | array( |
| 1065 | 1065 | // See CMB2_Sanitize::_save_utc_value() |
| 1066 | 1066 | 'file', |
@@ -1079,7 +1079,7 @@ discard block |
||
| 1079 | 1079 | * @param array $attrs Array of attributes to update |
| 1080 | 1080 | */ |
| 1081 | 1081 | public function maybe_set_attributes( $attrs = array() ) { |
| 1082 | - return wp_parse_args( $this->args['attributes'], $attrs ); |
|
| 1082 | + return wp_parse_args( $this->args[ 'attributes' ], $attrs ); |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | 1085 | } |
@@ -51,17 +51,17 @@ |
||
| 51 | 51 | $dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies ); |
| 52 | 52 | |
| 53 | 53 | // if colorpicker |
| 54 | - if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) { |
|
| 54 | + if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) { |
|
| 55 | 55 | self::colorpicker_frontend(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | // if file/file_list |
| 59 | - if ( isset( $dependencies['media-editor'] ) ) { |
|
| 59 | + if ( isset( $dependencies[ 'media-editor' ] ) ) { |
|
| 60 | 60 | wp_enqueue_media(); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // if timepicker |
| 64 | - if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) { |
|
| 64 | + if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) { |
|
| 65 | 65 | wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION ); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | |
| 132 | 132 | if ( ! $single ) { |
| 133 | 133 | // If multiple, add to array |
| 134 | - $this->options[ $field_id ][] = $value; |
|
| 134 | + $this->options[ $field_id ][ ] = $value; |
|
| 135 | 135 | } else { |
| 136 | 136 | $this->options[ $field_id ] = $value; |
| 137 | 137 | } |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | global $wp_locale; |
| 174 | 174 | |
| 175 | - $search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] ); |
|
| 175 | + $search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] ); |
|
| 176 | 176 | $replace = array( '', '.' ); |
| 177 | 177 | |
| 178 | 178 | // for repeatable |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | return $repeat_value; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if ( isset( $this->value['date'], $this->value['time'] ) ) { |
|
| 219 | - $this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] ); |
|
| 218 | + if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) { |
|
| 219 | + $this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] ); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ( $tz_offset = $this->field->field_timezone_offset() ) { |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $tzstring = null; |
| 255 | 255 | |
| 256 | 256 | if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) { |
| 257 | - $tzstring = $this->value['timezone']; |
|
| 257 | + $tzstring = $this->value[ 'timezone' ]; |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if ( empty( $tzstring ) ) { |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | $tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 ); |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - $full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format']; |
|
| 278 | - $full_date = $this->value['date'] . ' ' . $this->value['time']; |
|
| 277 | + $full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ]; |
|
| 278 | + $full_date = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ]; |
|
| 279 | 279 | |
| 280 | 280 | try { |
| 281 | 281 | |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | } else { |
| 299 | 299 | // Save the utc timestamp supporting field |
| 300 | 300 | if ( $repeat ) { |
| 301 | - $utc_values[ $utc_key ][] = $utc_stamp; |
|
| 301 | + $utc_values[ $utc_key ][ ] = $utc_stamp; |
|
| 302 | 302 | } else { |
| 303 | 303 | $this->_save_utc_value( $utc_key, $utc_stamp ); |
| 304 | 304 | } |
@@ -409,10 +409,10 @@ discard block |
||
| 409 | 409 | */ |
| 410 | 410 | public function _new_supporting_field( $new_field_id ) { |
| 411 | 411 | $args = $this->field->args(); |
| 412 | - unset( $args['_id'], $args['_name'] ); |
|
| 412 | + unset( $args[ '_id' ], $args[ '_name' ] ); |
|
| 413 | 413 | |
| 414 | - $args['id'] = $new_field_id; |
|
| 415 | - $args['sanitization_cb'] = false; |
|
| 414 | + $args[ 'id' ] = $new_field_id; |
|
| 415 | + $args[ 'sanitization_cb' ] = false; |
|
| 416 | 416 | |
| 417 | 417 | // And get new field object |
| 418 | 418 | return new CMB2_Field( array( |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | if ( $this->value ) { |
| 443 | 443 | $val = $this->$method( true ); |
| 444 | 444 | if ( ! empty( $val ) ) { |
| 445 | - $new_value[] = $val; |
|
| 445 | + $new_value[ ] = $val; |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | 448 | } |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | * @return mixed show_on key or false |
| 28 | 28 | */ |
| 29 | 29 | private static function get_show_on_key( $meta_box_args ) { |
| 30 | - $show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false; |
|
| 30 | + $show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false; |
|
| 31 | 31 | if ( $show_on && is_array( $show_on ) ) { |
| 32 | 32 | |
| 33 | 33 | if ( array_key_exists( 'key', $show_on ) ) { |
| 34 | - return $show_on['key']; |
|
| 34 | + return $show_on[ 'key' ]; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $keys = array_keys( $show_on ); |
| 38 | - return $keys[0]; |
|
| 38 | + return $keys[ 0 ]; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | return false; |
@@ -51,17 +51,17 @@ discard block |
||
| 51 | 51 | * @return mixed show_on value or false |
| 52 | 52 | */ |
| 53 | 53 | private static function get_show_on_value( $meta_box_args ) { |
| 54 | - $show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false; |
|
| 54 | + $show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false; |
|
| 55 | 55 | |
| 56 | 56 | if ( $show_on && is_array( $show_on ) ) { |
| 57 | 57 | |
| 58 | 58 | if ( array_key_exists( 'value', $show_on ) ) { |
| 59 | - return $show_on['value']; |
|
| 59 | + return $show_on[ 'value' ]; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | $keys = array_keys( $show_on ); |
| 63 | 63 | |
| 64 | - return $show_on[ $keys[0] ]; |
|
| 64 | + return $show_on[ $keys[ 0 ] ]; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | return array(); |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | if ( is_admin() ) { |
| 142 | 142 | |
| 143 | 143 | // If there is no 'page' query var, our filter isn't applicable |
| 144 | - if ( ! isset( $_GET['page'] ) ) { |
|
| 144 | + if ( ! isset( $_GET[ 'page' ] ) ) { |
|
| 145 | 145 | return $display; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -153,12 +153,12 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | if ( is_array( $show_on ) ) { |
| 155 | 155 | foreach ( $show_on as $page ) { |
| 156 | - if ( $_GET['page'] == $page ) { |
|
| 156 | + if ( $_GET[ 'page' ] == $page ) { |
|
| 157 | 157 | return true; |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | } else { |
| 161 | - if ( $_GET['page'] == $show_on ) { |
|
| 161 | + if ( $_GET[ 'page' ] == $show_on ) { |
|
| 162 | 162 | return true; |
| 163 | 163 | } |
| 164 | 164 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $dir = wp_upload_dir(); |
| 31 | 31 | |
| 32 | 32 | // Is URL in uploads directory? |
| 33 | - if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) { |
|
| 33 | + if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) { |
|
| 34 | 34 | return false; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -55,8 +55,8 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | foreach ( $query->posts as $post_id ) { |
| 57 | 57 | $meta = wp_get_attachment_metadata( $post_id ); |
| 58 | - $original_file = basename( $meta['file'] ); |
|
| 59 | - $cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array(); |
|
| 58 | + $original_file = basename( $meta[ 'file' ] ); |
|
| 59 | + $cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array(); |
|
| 60 | 60 | if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) { |
| 61 | 61 | $attachment_id = $post_id; |
| 62 | 62 | break; |
@@ -135,8 +135,7 @@ discard block |
||
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | return $this->is_valid_time_stamp( $string ) |
| 138 | - ? (int) $string : |
|
| 139 | - strtotime( (string) $string ); |
|
| 138 | + ? (int) $string : strtotime( (string) $string ); |
|
| 140 | 139 | } |
| 141 | 140 | |
| 142 | 141 | /** |
@@ -241,24 +240,24 @@ discard block |
||
| 241 | 240 | |
| 242 | 241 | // order is relevant here, since the replacement will be done sequentially. |
| 243 | 242 | $supported_options = array( |
| 244 | - 'd' => 'dd', // Day, leading 0 |
|
| 245 | - 'j' => 'd', // Day, no 0 |
|
| 246 | - 'z' => 'o', // Day of the year, no leading zeroes, |
|
| 243 | + 'd' => 'dd', // Day, leading 0 |
|
| 244 | + 'j' => 'd', // Day, no 0 |
|
| 245 | + 'z' => 'o', // Day of the year, no leading zeroes, |
|
| 247 | 246 | // 'D' => 'D', // Day name short, not sure how it'll work with translations |
| 248 | 247 | // 'l' => 'DD', // Day name full, idem before |
| 249 | - 'm' => 'mm', // Month of the year, leading 0 |
|
| 250 | - 'n' => 'm', // Month of the year, no leading 0 |
|
| 248 | + 'm' => 'mm', // Month of the year, leading 0 |
|
| 249 | + 'n' => 'm', // Month of the year, no leading 0 |
|
| 251 | 250 | // 'M' => 'M', // Month, Short name |
| 252 | 251 | // 'F' => 'MM', // Month, full name, |
| 253 | - 'y' => 'y', // Year, two digit |
|
| 254 | - 'Y' => 'yy', // Year, full |
|
| 255 | - 'H' => 'HH', // Hour with leading 0 (24 hour) |
|
| 256 | - 'G' => 'H', // Hour with no leading 0 (24 hour) |
|
| 257 | - 'h' => 'hh', // Hour with leading 0 (12 hour) |
|
| 258 | - 'g' => 'h', // Hour with no leading 0 (12 hour), |
|
| 259 | - 'i' => 'mm', // Minute with leading 0, |
|
| 260 | - 's' => 'ss', // Second with leading 0, |
|
| 261 | - 'a' => 'tt', // am/pm |
|
| 252 | + 'y' => 'y', // Year, two digit |
|
| 253 | + 'Y' => 'yy', // Year, full |
|
| 254 | + 'H' => 'HH', // Hour with leading 0 (24 hour) |
|
| 255 | + 'G' => 'H', // Hour with no leading 0 (24 hour) |
|
| 256 | + 'h' => 'hh', // Hour with leading 0 (12 hour) |
|
| 257 | + 'g' => 'h', // Hour with no leading 0 (12 hour), |
|
| 258 | + 'i' => 'mm', // Minute with leading 0, |
|
| 259 | + 's' => 'ss', // Second with leading 0, |
|
| 260 | + 'a' => 'tt', // am/pm |
|
| 262 | 261 | 'A' => 'TT' // AM/PM |
| 263 | 262 | ); |
| 264 | 263 | |
@@ -279,7 +278,7 @@ discard block |
||
| 279 | 278 | * @return string Modified value |
| 280 | 279 | */ |
| 281 | 280 | public function wrap_escaped_chars( $value ) { |
| 282 | - return "'" . str_replace( '\\', '', $value[0] ) . "'"; |
|
| 281 | + return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'"; |
|
| 283 | 282 | } |
| 284 | 283 | |
| 285 | 284 | /** |