@@ -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 | |
@@ -111,19 +111,19 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function __construct( $config, $object_id = 0 ) { |
| 113 | 113 | |
| 114 | - if ( empty( $config['id'] ) ) { |
|
| 114 | + if ( empty( $config[ 'id' ] ) ) { |
|
| 115 | 115 | wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) ); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $this->meta_box = wp_parse_args( $config, $this->mb_defaults ); |
| 119 | - $this->meta_box['fields'] = array(); |
|
| 119 | + $this->meta_box[ 'fields' ] = array(); |
|
| 120 | 120 | |
| 121 | 121 | $this->object_id( $object_id ); |
| 122 | 122 | $this->mb_object_type(); |
| 123 | - $this->cmb_id = $config['id']; |
|
| 123 | + $this->cmb_id = $config[ 'id' ]; |
|
| 124 | 124 | |
| 125 | - if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) { |
|
| 126 | - $this->add_fields( $config['fields'] ); |
|
| 125 | + if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) { |
|
| 126 | + $this->add_fields( $config[ 'fields' ] ); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | CMB2_Boxes::add( $this ); |
@@ -292,22 +292,22 @@ discard block |
||
| 292 | 292 | * @return mixed CMB2_Field object if successful. |
| 293 | 293 | */ |
| 294 | 294 | public function render_field( $field_args ) { |
| 295 | - $field_args['context'] = $this->prop( 'context' ); |
|
| 295 | + $field_args[ 'context' ] = $this->prop( 'context' ); |
|
| 296 | 296 | |
| 297 | - if ( 'group' == $field_args['type'] ) { |
|
| 297 | + if ( 'group' == $field_args[ 'type' ] ) { |
|
| 298 | 298 | |
| 299 | - if ( ! isset( $field_args['show_names'] ) ) { |
|
| 300 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 299 | + if ( ! isset( $field_args[ 'show_names' ] ) ) { |
|
| 300 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 301 | 301 | } |
| 302 | 302 | $field = $this->render_group( $field_args ); |
| 303 | 303 | |
| 304 | - } elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) { |
|
| 304 | + } elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) { |
|
| 305 | 305 | // Save rendering for after the metabox |
| 306 | 306 | $field = $this->add_hidden_field( $field_args ); |
| 307 | 307 | |
| 308 | 308 | } else { |
| 309 | 309 | |
| 310 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
| 310 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
| 311 | 311 | |
| 312 | 312 | // Render default fields |
| 313 | 313 | $field = $this->get_field( $field_args )->render_field(); |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | */ |
| 324 | 324 | public function render_group( $args ) { |
| 325 | 325 | |
| 326 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
| 326 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 327 | 327 | return; |
| 328 | 328 | } |
| 329 | 329 | |
@@ -405,15 +405,15 @@ discard block |
||
| 405 | 405 | <div class="inside cmb-td cmb-nested cmb-field-list">'; |
| 406 | 406 | // Loop and render repeatable group fields |
| 407 | 407 | foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) { |
| 408 | - if ( 'hidden' == $field_args['type'] ) { |
|
| 408 | + if ( 'hidden' == $field_args[ 'type' ] ) { |
|
| 409 | 409 | |
| 410 | 410 | // Save rendering for after the metabox |
| 411 | 411 | $this->add_hidden_field( $field_args, $field_group ); |
| 412 | 412 | |
| 413 | 413 | } else { |
| 414 | 414 | |
| 415 | - $field_args['show_names'] = $field_group->args( 'show_names' ); |
|
| 416 | - $field_args['context'] = $field_group->args( 'context' ); |
|
| 415 | + $field_args[ 'show_names' ] = $field_group->args( 'show_names' ); |
|
| 416 | + $field_args[ 'context' ] = $field_group->args( 'context' ); |
|
| 417 | 417 | |
| 418 | 418 | $field = $this->get_field( $field_args, $field_group )->render_field(); |
| 419 | 419 | } |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | * @param array $field_args Array of field arguments to be passed to CMB2_Field |
| 442 | 442 | */ |
| 443 | 443 | public function add_hidden_field( $field_args, $field_group = null ) { |
| 444 | - if ( isset( $field_args['field_args'] ) ) { |
|
| 444 | + if ( isset( $field_args[ 'field_args' ] ) ) { |
|
| 445 | 445 | // For back-compatibility. |
| 446 | 446 | $field = new CMB2_Field( $field_args ); |
| 447 | 447 | } else { |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | $type->iterator = $field_group->index; |
| 455 | 455 | } |
| 456 | 456 | |
| 457 | - $this->hidden_fields[] = $type; |
|
| 457 | + $this->hidden_fields[ ] = $type; |
|
| 458 | 458 | |
| 459 | 459 | return $field; |
| 460 | 460 | } |
@@ -551,11 +551,11 @@ discard block |
||
| 551 | 551 | */ |
| 552 | 552 | public function process_field( $field_args ) { |
| 553 | 553 | |
| 554 | - switch ( $field_args['type'] ) { |
|
| 554 | + switch ( $field_args[ 'type' ] ) { |
|
| 555 | 555 | |
| 556 | 556 | case 'group': |
| 557 | 557 | if ( $this->save_group( $field_args ) ) { |
| 558 | - $this->updated[] = $field_args['id']; |
|
| 558 | + $this->updated[ ] = $field_args[ 'id' ]; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | break; |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | $field = $this->get_new_field( $field_args ); |
| 570 | 570 | |
| 571 | 571 | if ( $field->save_field_from_data( $this->data_to_save ) ) { |
| 572 | - $this->updated[] = $field->id(); |
|
| 572 | + $this->updated[ ] = $field->id(); |
|
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | break; |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | * @return mixed Return of CMB2_Field::update_data() |
| 637 | 637 | */ |
| 638 | 638 | public function save_group( $args ) { |
| 639 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
| 639 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
| 640 | 640 | return; |
| 641 | 641 | } |
| 642 | 642 | |
@@ -684,16 +684,16 @@ discard block |
||
| 684 | 684 | $_new_val = array(); |
| 685 | 685 | foreach ( $new_val as $group_index => $grouped_data ) { |
| 686 | 686 | // Add the supporting data to the $saved array stack |
| 687 | - $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value']; |
|
| 687 | + $saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ]; |
|
| 688 | 688 | // Reset var to the actual value |
| 689 | - $_new_val[ $group_index ] = $grouped_data['value']; |
|
| 689 | + $_new_val[ $group_index ] = $grouped_data[ 'value' ]; |
|
| 690 | 690 | } |
| 691 | 691 | $new_val = $_new_val; |
| 692 | 692 | } else { |
| 693 | 693 | // Add the supporting data to the $saved array stack |
| 694 | - $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value']; |
|
| 694 | + $saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ]; |
|
| 695 | 695 | // Reset var to the actual value |
| 696 | - $new_val = $new_val['value']; |
|
| 696 | + $new_val = $new_val[ 'value' ]; |
|
| 697 | 697 | } |
| 698 | 698 | } |
| 699 | 699 | |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | |
| 708 | 708 | // Compare values and add to `$updated` array |
| 709 | 709 | if ( $is_updated || $is_removed ) { |
| 710 | - $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 710 | + $this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | // Add to `$saved` array |
@@ -744,22 +744,22 @@ discard block |
||
| 744 | 744 | // Try to get our object ID from the global space |
| 745 | 745 | switch ( $this->object_type() ) { |
| 746 | 746 | case 'user': |
| 747 | - $object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id; |
|
| 748 | - $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id; |
|
| 747 | + $object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id; |
|
| 748 | + $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id; |
|
| 749 | 749 | break; |
| 750 | 750 | |
| 751 | 751 | case 'comment': |
| 752 | - $object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id; |
|
| 753 | - $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id; |
|
| 752 | + $object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id; |
|
| 753 | + $object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id; |
|
| 754 | 754 | break; |
| 755 | 755 | |
| 756 | 756 | case 'term': |
| 757 | - $object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id; |
|
| 757 | + $object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id; |
|
| 758 | 758 | break; |
| 759 | 759 | |
| 760 | 760 | default: |
| 761 | - $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id; |
|
| 762 | - $object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id; |
|
| 761 | + $object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id; |
|
| 762 | + $object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id; |
|
| 763 | 763 | break; |
| 764 | 764 | } |
| 765 | 765 | |
@@ -835,7 +835,7 @@ discard block |
||
| 835 | 835 | * @return boolean True/False |
| 836 | 836 | */ |
| 837 | 837 | public function is_options_page_mb() { |
| 838 | - 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'] ) ); |
|
| 838 | + 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' ] ) ); |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | /** |
@@ -922,7 +922,7 @@ discard block |
||
| 922 | 922 | return $field; |
| 923 | 923 | } |
| 924 | 924 | |
| 925 | - $field_id = is_string( $field ) ? $field : $field['id']; |
|
| 925 | + $field_id = is_string( $field ) ? $field : $field[ 'id' ]; |
|
| 926 | 926 | |
| 927 | 927 | $parent_field_id = ! empty( $field_group ) ? $field_group->id() : ''; |
| 928 | 928 | $ids = $this->get_field_ids( $field_id, $parent_field_id, true ); |
@@ -958,16 +958,16 @@ discard block |
||
| 958 | 958 | if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) { |
| 959 | 959 | |
| 960 | 960 | // Update the fields array w/ any modified properties inherited from the group field |
| 961 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args; |
|
| 961 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args; |
|
| 962 | 962 | |
| 963 | 963 | return $this->get_default_args( $field_args, $field_group ); |
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | if ( is_array( $field_args ) ) { |
| 967 | - $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] ); |
|
| 967 | + $this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 968 | 968 | } |
| 969 | 969 | |
| 970 | - return $this->get_default_args( $this->meta_box['fields'][ $field_id ] ); |
|
| 970 | + return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 971 | 971 | } |
| 972 | 972 | |
| 973 | 973 | /** |
@@ -1017,8 +1017,8 @@ discard block |
||
| 1017 | 1017 | |
| 1018 | 1018 | $sub_fields = false; |
| 1019 | 1019 | if ( array_key_exists( 'fields', $field ) ) { |
| 1020 | - $sub_fields = $field['fields']; |
|
| 1021 | - unset( $field['fields'] ); |
|
| 1020 | + $sub_fields = $field[ 'fields' ]; |
|
| 1021 | + unset( $field[ 'fields' ] ); |
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | $field_id = $parent_field_id |
@@ -1043,26 +1043,26 @@ discard block |
||
| 1043 | 1043 | return false; |
| 1044 | 1044 | } |
| 1045 | 1045 | |
| 1046 | - if ( 'oembed' === $field['type'] ) { |
|
| 1046 | + if ( 'oembed' === $field[ 'type' ] ) { |
|
| 1047 | 1047 | // Initiate oembed Ajax hooks |
| 1048 | 1048 | cmb2_ajax(); |
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | - if ( isset( $field['column'] ) && false !== $field['column'] ) { |
|
| 1051 | + if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) { |
|
| 1052 | 1052 | $field = $this->define_field_column( $field ); |
| 1053 | 1053 | } |
| 1054 | 1054 | |
| 1055 | - if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) { |
|
| 1056 | - $this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy']; |
|
| 1055 | + if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) { |
|
| 1056 | + $this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ]; |
|
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | 1059 | $this->_add_field_to_array( |
| 1060 | 1060 | $field, |
| 1061 | - $this->meta_box['fields'], |
|
| 1061 | + $this->meta_box[ 'fields' ], |
|
| 1062 | 1062 | $position |
| 1063 | 1063 | ); |
| 1064 | 1064 | |
| 1065 | - return $field['id']; |
|
| 1065 | + return $field[ 'id' ]; |
|
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | 1068 | /** |
@@ -1074,10 +1074,10 @@ discard block |
||
| 1074 | 1074 | protected function define_field_column( array $field ) { |
| 1075 | 1075 | $this->has_columns = true; |
| 1076 | 1076 | |
| 1077 | - $column = is_array( $field['column'] ) ? $field['column'] : array(); |
|
| 1077 | + $column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array(); |
|
| 1078 | 1078 | |
| 1079 | - $field['column'] = wp_parse_args( $column, array( |
|
| 1080 | - 'name' => isset( $field['name'] ) ? $field['name'] : '', |
|
| 1079 | + $field[ 'column' ] = wp_parse_args( $column, array( |
|
| 1080 | + 'name' => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '', |
|
| 1081 | 1081 | 'position' => false, |
| 1082 | 1082 | ) ); |
| 1083 | 1083 | |
@@ -1093,27 +1093,27 @@ discard block |
||
| 1093 | 1093 | * @return mixed Array of parent/field ids or false |
| 1094 | 1094 | */ |
| 1095 | 1095 | public function add_group_field( $parent_field_id, array $field, $position = 0 ) { |
| 1096 | - if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) { |
|
| 1096 | + if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) { |
|
| 1097 | 1097 | return false; |
| 1098 | 1098 | } |
| 1099 | 1099 | |
| 1100 | - $parent_field = $this->meta_box['fields'][ $parent_field_id ]; |
|
| 1100 | + $parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ]; |
|
| 1101 | 1101 | |
| 1102 | - if ( 'group' !== $parent_field['type'] ) { |
|
| 1102 | + if ( 'group' !== $parent_field[ 'type' ] ) { |
|
| 1103 | 1103 | return false; |
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | - if ( ! isset( $parent_field['fields'] ) ) { |
|
| 1107 | - $this->meta_box['fields'][ $parent_field_id ]['fields'] = array(); |
|
| 1106 | + if ( ! isset( $parent_field[ 'fields' ] ) ) { |
|
| 1107 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array(); |
|
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | 1110 | $this->_add_field_to_array( |
| 1111 | 1111 | $field, |
| 1112 | - $this->meta_box['fields'][ $parent_field_id ]['fields'], |
|
| 1112 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ], |
|
| 1113 | 1113 | $position |
| 1114 | 1114 | ); |
| 1115 | 1115 | |
| 1116 | - return array( $parent_field_id, $field['id'] ); |
|
| 1116 | + return array( $parent_field_id, $field[ 'id' ] ); |
|
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | 1119 | /** |
@@ -1125,9 +1125,9 @@ discard block |
||
| 1125 | 1125 | */ |
| 1126 | 1126 | protected function _add_field_to_array( $field, &$fields, $position = 0 ) { |
| 1127 | 1127 | if ( $position ) { |
| 1128 | - cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position ); |
|
| 1128 | + cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position ); |
|
| 1129 | 1129 | } else { |
| 1130 | - $fields[ $field['id'] ] = $field; |
|
| 1130 | + $fields[ $field[ 'id' ] ] = $field; |
|
| 1131 | 1131 | } |
| 1132 | 1132 | } |
| 1133 | 1133 | |
@@ -1150,15 +1150,15 @@ discard block |
||
| 1150 | 1150 | unset( $this->fields[ implode( '', $ids ) ] ); |
| 1151 | 1151 | |
| 1152 | 1152 | if ( ! $sub_field_id ) { |
| 1153 | - unset( $this->meta_box['fields'][ $field_id ] ); |
|
| 1153 | + unset( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
| 1154 | 1154 | return true; |
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | - if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) { |
|
| 1158 | - unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ); |
|
| 1157 | + if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) { |
|
| 1158 | + unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ); |
|
| 1159 | 1159 | } |
| 1160 | - if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) { |
|
| 1161 | - unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ); |
|
| 1160 | + if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) { |
|
| 1161 | + unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ); |
|
| 1162 | 1162 | } |
| 1163 | 1163 | return true; |
| 1164 | 1164 | } |
@@ -1182,11 +1182,11 @@ discard block |
||
| 1182 | 1182 | list( $field_id, $sub_field_id ) = $ids; |
| 1183 | 1183 | |
| 1184 | 1184 | if ( ! $sub_field_id ) { |
| 1185 | - $this->meta_box['fields'][ $field_id ][ $property ] = $value; |
|
| 1185 | + $this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value; |
|
| 1186 | 1186 | return $field_id; |
| 1187 | 1187 | } |
| 1188 | 1188 | |
| 1189 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value; |
|
| 1189 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value; |
|
| 1190 | 1190 | return $field_id; |
| 1191 | 1191 | } |
| 1192 | 1192 | |
@@ -1200,7 +1200,7 @@ discard block |
||
| 1200 | 1200 | public function get_field_ids( $field_id, $parent_field_id = '' ) { |
| 1201 | 1201 | $sub_field_id = $parent_field_id ? $field_id : ''; |
| 1202 | 1202 | $field_id = $parent_field_id ? $parent_field_id : $field_id; |
| 1203 | - $fields =& $this->meta_box['fields']; |
|
| 1203 | + $fields = & $this->meta_box[ 'fields' ]; |
|
| 1204 | 1204 | |
| 1205 | 1205 | if ( ! array_key_exists( $field_id, $fields ) ) { |
| 1206 | 1206 | $field_id = $this->search_old_school_array( $field_id, $fields ); |
@@ -1214,12 +1214,12 @@ discard block |
||
| 1214 | 1214 | return array( $field_id, $sub_field_id ); |
| 1215 | 1215 | } |
| 1216 | 1216 | |
| 1217 | - if ( 'group' !== $fields[ $field_id ]['type'] ) { |
|
| 1217 | + if ( 'group' !== $fields[ $field_id ][ 'type' ] ) { |
|
| 1218 | 1218 | return false; |
| 1219 | 1219 | } |
| 1220 | 1220 | |
| 1221 | - if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) { |
|
| 1222 | - $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] ); |
|
| 1221 | + if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) { |
|
| 1222 | + $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] ); |
|
| 1223 | 1223 | } |
| 1224 | 1224 | |
| 1225 | 1225 | return false === $sub_field_id ? false : array( $field_id, $sub_field_id ); |
@@ -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 | } |
@@ -110,21 +110,21 @@ discard block |
||
| 110 | 110 | */ |
| 111 | 111 | public function __construct( $args ) { |
| 112 | 112 | |
| 113 | - if ( ! empty( $args['group_field'] ) ) { |
|
| 114 | - $this->group = $args['group_field']; |
|
| 113 | + if ( ! empty( $args[ 'group_field' ] ) ) { |
|
| 114 | + $this->group = $args[ 'group_field' ]; |
|
| 115 | 115 | $this->object_id = $this->group->object_id; |
| 116 | 116 | $this->object_type = $this->group->object_type; |
| 117 | 117 | $this->cmb_id = $this->group->cmb_id; |
| 118 | 118 | } else { |
| 119 | - $this->object_id = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0; |
|
| 120 | - $this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post'; |
|
| 119 | + $this->object_id = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0; |
|
| 120 | + $this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post'; |
|
| 121 | 121 | |
| 122 | - if ( isset( $args['cmb_id'] ) ) { |
|
| 123 | - $this->cmb_id = $args['cmb_id']; |
|
| 122 | + if ( isset( $args[ 'cmb_id' ] ) ) { |
|
| 123 | + $this->cmb_id = $args[ 'cmb_id' ]; |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - $this->args = $this->_set_field_defaults( $args['field_args'], $args ); |
|
| 127 | + $this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args ); |
|
| 128 | 128 | |
| 129 | 129 | if ( $this->object_id ) { |
| 130 | 130 | $this->value = $this->get_data(); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | * @return mixed Value of field argument |
| 140 | 140 | */ |
| 141 | 141 | public function __call( $name, $arguments ) { |
| 142 | - $key = isset( $arguments[0] ) ? $arguments[0] : false; |
|
| 142 | + $key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false; |
|
| 143 | 143 | return $this->args( $name, $key ); |
| 144 | 144 | } |
| 145 | 145 | |
@@ -210,9 +210,9 @@ discard block |
||
| 210 | 210 | */ |
| 211 | 211 | public function get_data( $field_id = '', $args = array() ) { |
| 212 | 212 | if ( $field_id ) { |
| 213 | - $args['field_id'] = $field_id; |
|
| 213 | + $args[ 'field_id' ] = $field_id; |
|
| 214 | 214 | } else if ( $this->group ) { |
| 215 | - $args['field_id'] = $this->group->id(); |
|
| 215 | + $args[ 'field_id' ] = $this->group->id(); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | $a = $this->data_args( $args ); |
@@ -253,13 +253,13 @@ discard block |
||
| 253 | 253 | * |
| 254 | 254 | * @since 2.0.0 |
| 255 | 255 | */ |
| 256 | - $data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this ); |
|
| 256 | + $data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this ); |
|
| 257 | 257 | |
| 258 | 258 | // If no override, get value normally |
| 259 | 259 | if ( 'cmb2_field_no_override_val' === $data ) { |
| 260 | - $data = 'options-page' === $a['type'] |
|
| 261 | - ? cmb2_options( $a['id'] )->get( $a['field_id'] ) |
|
| 262 | - : get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) ); |
|
| 260 | + $data = 'options-page' === $a[ 'type' ] |
|
| 261 | + ? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] ) |
|
| 262 | + : get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) ); |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | if ( $this->group ) { |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | public function update_data( $new_value, $single = true ) { |
| 282 | 282 | $a = $this->data_args( array( 'single' => $single ) ); |
| 283 | 283 | |
| 284 | - $a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value; |
|
| 284 | + $a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value; |
|
| 285 | 285 | |
| 286 | 286 | /** |
| 287 | 287 | * Filter whether to override saving of meta value. |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | * |
| 318 | 318 | * @since 2.0.0 |
| 319 | 319 | */ |
| 320 | - $override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this ); |
|
| 320 | + $override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this ); |
|
| 321 | 321 | |
| 322 | 322 | // If override, return that |
| 323 | 323 | if ( null !== $override ) { |
@@ -325,22 +325,22 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | // Options page handling (or temp data store) |
| 328 | - if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { |
|
| 329 | - return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] ); |
|
| 328 | + if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) { |
|
| 329 | + return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] ); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | // Add metadata if not single |
| 333 | - if ( ! $a['single'] ) { |
|
| 334 | - return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false ); |
|
| 333 | + if ( ! $a[ 'single' ] ) { |
|
| 334 | + return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false ); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | // Delete meta if we have an empty array |
| 338 | - if ( is_array( $a['value'] ) && empty( $a['value'] ) ) { |
|
| 339 | - return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value ); |
|
| 338 | + if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) { |
|
| 339 | + return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value ); |
|
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | // Update metadata |
| 343 | - return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] ); |
|
| 343 | + return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] ); |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | /** |
@@ -390,19 +390,19 @@ discard block |
||
| 390 | 390 | * @param array $field_args All field arguments |
| 391 | 391 | * @param CMB2_Field object $field This field object |
| 392 | 392 | */ |
| 393 | - $override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this ); |
|
| 393 | + $override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this ); |
|
| 394 | 394 | |
| 395 | 395 | // If no override, remove as usual |
| 396 | 396 | if ( null !== $override ) { |
| 397 | 397 | return $override; |
| 398 | 398 | } |
| 399 | 399 | // Option page handling |
| 400 | - elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) { |
|
| 401 | - return cmb2_options( $a['id'] )->remove( $a['field_id'] ); |
|
| 400 | + elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) { |
|
| 401 | + return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] ); |
|
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | // Remove metadata |
| 405 | - return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old ); |
|
| 405 | + return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old ); |
|
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | /** |
@@ -854,7 +854,7 @@ discard block |
||
| 854 | 854 | |
| 855 | 855 | foreach ( $conditional_classes as $class => $condition ) { |
| 856 | 856 | if ( $condition ) { |
| 857 | - $classes[] = $class; |
|
| 857 | + $classes[ ] = $class; |
|
| 858 | 858 | } |
| 859 | 859 | } |
| 860 | 860 | |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | if ( $added_classes ) { |
| 868 | - $classes[] = esc_attr( $added_classes ); |
|
| 868 | + $classes[ ] = esc_attr( $added_classes ); |
|
| 869 | 869 | } |
| 870 | 870 | |
| 871 | 871 | /** |
@@ -965,10 +965,10 @@ discard block |
||
| 965 | 965 | public function string( $text_key, $fallback ) { |
| 966 | 966 | // If null, populate with our field strings values. |
| 967 | 967 | if ( null === $this->strings ) { |
| 968 | - $this->strings = (array) $this->args['text']; |
|
| 968 | + $this->strings = (array) $this->args[ 'text' ]; |
|
| 969 | 969 | |
| 970 | - if ( is_callable( $this->args['text_cb'] ) ) { |
|
| 971 | - $strings = call_user_func( $this->args['text_cb'], $this ); |
|
| 970 | + if ( is_callable( $this->args[ 'text_cb' ] ) ) { |
|
| 971 | + $strings = call_user_func( $this->args[ 'text_cb' ], $this ); |
|
| 972 | 972 | |
| 973 | 973 | if ( $strings && is_array( $strings ) ) { |
| 974 | 974 | $this->strings += $strings; |
@@ -1002,10 +1002,10 @@ discard block |
||
| 1002 | 1002 | return $this->field_options; |
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | - $this->field_options = (array) $this->args['options']; |
|
| 1005 | + $this->field_options = (array) $this->args[ 'options' ]; |
|
| 1006 | 1006 | |
| 1007 | - if ( is_callable( $this->args['options_cb'] ) ) { |
|
| 1008 | - $options = call_user_func( $this->args['options_cb'], $this ); |
|
| 1007 | + if ( is_callable( $this->args[ 'options_cb' ] ) ) { |
|
| 1008 | + $options = call_user_func( $this->args[ 'options_cb' ], $this ); |
|
| 1009 | 1009 | |
| 1010 | 1010 | if ( $options && is_array( $options ) ) { |
| 1011 | 1011 | $this->field_options = $options + $this->field_options; |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | */ |
| 1027 | 1027 | public function add_js_dependencies( $dependencies = array() ) { |
| 1028 | 1028 | foreach ( (array) $dependencies as $dependency ) { |
| 1029 | - $this->args['js_dependencies'][ $dependency ] = $dependency; |
|
| 1029 | + $this->args[ 'js_dependencies' ][ $dependency ] = $dependency; |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | CMB2_JS::add_dependencies( $dependencies ); |
@@ -1040,17 +1040,17 @@ discard block |
||
| 1040 | 1040 | * @return mixed Default field value |
| 1041 | 1041 | */ |
| 1042 | 1042 | public function get_default() { |
| 1043 | - if ( null !== $this->args['default'] ) { |
|
| 1044 | - return $this->args['default']; |
|
| 1043 | + if ( null !== $this->args[ 'default' ] ) { |
|
| 1044 | + return $this->args[ 'default' ]; |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | - $param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default'; |
|
| 1047 | + $param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default'; |
|
| 1048 | 1048 | $default = $this->get_param_callback_result( $param ); |
| 1049 | 1049 | |
| 1050 | 1050 | // Allow a filter override of the default value |
| 1051 | - $this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this ); |
|
| 1051 | + $this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this ); |
|
| 1052 | 1052 | |
| 1053 | - return $this->args['default']; |
|
| 1053 | + return $this->args[ 'default' ]; |
|
| 1054 | 1054 | } |
| 1055 | 1055 | |
| 1056 | 1056 | /** |
@@ -1088,18 +1088,18 @@ discard block |
||
| 1088 | 1088 | 'classes_cb' => '', |
| 1089 | 1089 | 'select_all_button' => true, |
| 1090 | 1090 | 'multiple' => false, |
| 1091 | - 'repeatable' => isset( $args['type'] ) && 'group' == $args['type'], |
|
| 1091 | + 'repeatable' => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ], |
|
| 1092 | 1092 | 'inline' => false, |
| 1093 | 1093 | 'on_front' => true, |
| 1094 | 1094 | 'show_names' => true, |
| 1095 | 1095 | 'save_field' => true, // Will not save if false |
| 1096 | 1096 | 'date_format' => 'm\/d\/Y', |
| 1097 | 1097 | 'time_format' => 'h:i A', |
| 1098 | - 'description' => isset( $args['desc'] ) ? $args['desc'] : '', |
|
| 1099 | - 'preview_size' => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ), |
|
| 1098 | + 'description' => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '', |
|
| 1099 | + 'preview_size' => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ), |
|
| 1100 | 1100 | 'render_row_cb' => array( $this, 'render_field_callback' ), |
| 1101 | 1101 | 'display_cb' => array( $this, 'display_value_callback' ), |
| 1102 | - 'label_cb' => 'title' != $args['type'] ? array( $this, 'label' ) : '', |
|
| 1102 | + 'label_cb' => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '', |
|
| 1103 | 1103 | 'column' => false, |
| 1104 | 1104 | 'js_dependencies' => array(), |
| 1105 | 1105 | ) ); |
@@ -1108,73 +1108,73 @@ discard block |
||
| 1108 | 1108 | * Deprecated usage. |
| 1109 | 1109 | */ |
| 1110 | 1110 | |
| 1111 | - if ( isset( $args['row_classes'] ) ) { |
|
| 1111 | + if ( isset( $args[ 'row_classes' ] ) ) { |
|
| 1112 | 1112 | |
| 1113 | 1113 | // row_classes param could be a callback |
| 1114 | - if ( is_callable( $args['row_classes'] ) ) { |
|
| 1115 | - $args['classes_cb'] = $args['row_classes']; |
|
| 1116 | - $args['classes'] = null; |
|
| 1114 | + if ( is_callable( $args[ 'row_classes' ] ) ) { |
|
| 1115 | + $args[ 'classes_cb' ] = $args[ 'row_classes' ]; |
|
| 1116 | + $args[ 'classes' ] = null; |
|
| 1117 | 1117 | } else { |
| 1118 | - $args['classes'] = $args['row_classes']; |
|
| 1118 | + $args[ 'classes' ] = $args[ 'row_classes' ]; |
|
| 1119 | 1119 | } |
| 1120 | 1120 | |
| 1121 | - unset( $args['row_classes'] ); |
|
| 1121 | + unset( $args[ 'row_classes' ] ); |
|
| 1122 | 1122 | } |
| 1123 | 1123 | |
| 1124 | 1124 | // default param can be passed a callback as well |
| 1125 | - if ( is_callable( $args['default'] ) ) { |
|
| 1126 | - $args['default_cb'] = $args['default']; |
|
| 1127 | - $args['default'] = null; |
|
| 1125 | + if ( is_callable( $args[ 'default' ] ) ) { |
|
| 1126 | + $args[ 'default_cb' ] = $args[ 'default' ]; |
|
| 1127 | + $args[ 'default' ] = null; |
|
| 1128 | 1128 | } |
| 1129 | 1129 | |
| 1130 | 1130 | /* |
| 1131 | 1131 | * END deprecated usage. |
| 1132 | 1132 | */ |
| 1133 | 1133 | |
| 1134 | - $args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] ); |
|
| 1135 | - $args['inline'] = $args['inline'] || false !== stripos( $args['type'], '_inline' ); |
|
| 1134 | + $args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] ); |
|
| 1135 | + $args[ 'inline' ] = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' ); |
|
| 1136 | 1136 | |
| 1137 | 1137 | // options param can be passed a callback as well |
| 1138 | - if ( is_callable( $args['options'] ) ) { |
|
| 1139 | - $args['options_cb'] = $args['options']; |
|
| 1140 | - $args['options'] = array(); |
|
| 1138 | + if ( is_callable( $args[ 'options' ] ) ) { |
|
| 1139 | + $args[ 'options_cb' ] = $args[ 'options' ]; |
|
| 1140 | + $args[ 'options' ] = array(); |
|
| 1141 | 1141 | } |
| 1142 | 1142 | |
| 1143 | - $args['options'] = 'group' == $args['type'] ? wp_parse_args( $args['options'], array( |
|
| 1143 | + $args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array( |
|
| 1144 | 1144 | 'add_button' => esc_html__( 'Add Group', 'cmb2' ), |
| 1145 | 1145 | 'remove_button' => esc_html__( 'Remove Group', 'cmb2' ), |
| 1146 | - ) ) : $args['options']; |
|
| 1146 | + ) ) : $args[ 'options' ]; |
|
| 1147 | 1147 | |
| 1148 | - $args['_id'] = $args['id']; |
|
| 1149 | - $args['_name'] = $args['id']; |
|
| 1148 | + $args[ '_id' ] = $args[ 'id' ]; |
|
| 1149 | + $args[ '_name' ] = $args[ 'id' ]; |
|
| 1150 | 1150 | |
| 1151 | 1151 | if ( $this->group ) { |
| 1152 | 1152 | |
| 1153 | - $args['id'] = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id']; |
|
| 1154 | - $args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']'; |
|
| 1153 | + $args[ 'id' ] = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ]; |
|
| 1154 | + $args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']'; |
|
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | - if ( 'wysiwyg' == $args['type'] ) { |
|
| 1158 | - $args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) ); |
|
| 1159 | - $args['options']['textarea_name'] = $args['_name']; |
|
| 1157 | + if ( 'wysiwyg' == $args[ 'type' ] ) { |
|
| 1158 | + $args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) ); |
|
| 1159 | + $args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ]; |
|
| 1160 | 1160 | } |
| 1161 | 1161 | |
| 1162 | 1162 | $option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this ); |
| 1163 | 1163 | |
| 1164 | - if ( in_array( $args['type'], $option_types, true ) ) { |
|
| 1164 | + if ( in_array( $args[ 'type' ], $option_types, true ) ) { |
|
| 1165 | 1165 | |
| 1166 | - $args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null; |
|
| 1167 | - $args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none']; |
|
| 1166 | + $args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null; |
|
| 1167 | + $args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? esc_html__( 'None', 'cmb2' ) : $args[ 'show_option_none' ]; |
|
| 1168 | 1168 | |
| 1169 | - if ( null === $args['show_option_none'] ) { |
|
| 1170 | - $off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true ); |
|
| 1171 | - $args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' ); |
|
| 1169 | + if ( null === $args[ 'show_option_none' ] ) { |
|
| 1170 | + $off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true ); |
|
| 1171 | + $args[ 'show_option_none' ] = $off_by_default ? false : esc_html__( 'None', 'cmb2' ); |
|
| 1172 | 1172 | } |
| 1173 | 1173 | |
| 1174 | 1174 | } |
| 1175 | 1175 | |
| 1176 | - $args['has_supporting_data'] = in_array( |
|
| 1177 | - $args['type'], |
|
| 1176 | + $args[ 'has_supporting_data' ] = in_array( |
|
| 1177 | + $args[ 'type' ], |
|
| 1178 | 1178 | array( |
| 1179 | 1179 | // CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array() |
| 1180 | 1180 | 'file', |
@@ -1197,10 +1197,10 @@ discard block |
||
| 1197 | 1197 | protected function get_default_args( $field_args, $field_group = null ) { |
| 1198 | 1198 | $args = parent::get_default_args( array(), $this->group ); |
| 1199 | 1199 | |
| 1200 | - if ( isset( $field_args['field_args'] ) ) { |
|
| 1200 | + if ( isset( $field_args[ 'field_args' ] ) ) { |
|
| 1201 | 1201 | $args = wp_parse_args( $field_args, $args ); |
| 1202 | 1202 | } else { |
| 1203 | - $args['field_args'] = wp_parse_args( $field_args, $this->args ); |
|
| 1203 | + $args[ 'field_args' ] = wp_parse_args( $field_args, $this->args ); |
|
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | return $args; |