@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | * @param mixed $field_id Field (or group field) ID |
867 | 867 | * @param mixed $field_args Array of field arguments |
868 | 868 | * @param mixed $sub_field_id Sub field ID (if field_group exists) |
869 | - * @param mixed $field_group If a sub-field, will be the parent group CMB2_Field object |
|
869 | + * @param CMB2_Field|null $field_group If a sub-field, will be the parent group CMB2_Field object |
|
870 | 870 | * @return array Array of CMB2_Field arguments |
871 | 871 | */ |
872 | 872 | public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) { |
@@ -925,7 +925,7 @@ discard block |
||
925 | 925 | * @since 2.0.0 |
926 | 926 | * @param array $field Metabox field config array |
927 | 927 | * @param int $position (optional) Position of metabox. 1 for first, etc |
928 | - * @return mixed Field id or false |
|
928 | + * @return string Field id or false |
|
929 | 929 | */ |
930 | 930 | public function add_field( array $field, $position = 0 ) { |
931 | 931 | if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) { |
@@ -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 ); |
@@ -267,7 +267,7 @@ |
||
267 | 267 | * Add 'closed' class to metabox |
268 | 268 | * @since 2.0.0 |
269 | 269 | * @param array $classes Array of classes |
270 | - * @return array Modified array of classes |
|
270 | + * @return string[] Modified array of classes |
|
271 | 271 | */ |
272 | 272 | public function close_metabox_class( $classes ) { |
273 | 273 | $classes[] = 'closed'; |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | * @return array Modified array of classes |
271 | 271 | */ |
272 | 272 | public function close_metabox_class( $classes ) { |
273 | - $classes[] = 'closed'; |
|
273 | + $classes[ ] = 'closed'; |
|
274 | 274 | return $classes; |
275 | 275 | } |
276 | 276 | |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | public function user_new_metabox( $section ) { |
291 | 291 | if ( $section == $this->cmb->prop( 'new_user_section' ) ) { |
292 | 292 | $object_id = $this->cmb->object_id(); |
293 | - $this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id ); |
|
293 | + $this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id ); |
|
294 | 294 | $this->user_metabox(); |
295 | 295 | } |
296 | 296 | } |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | if ( $this->taxonomy_can_save( $taxonomy ) ) { |
442 | 442 | |
443 | 443 | foreach ( $this->cmb->prop( 'fields' ) as $field ) { |
444 | - $data_to_delete[ $field['id'] ] = ''; |
|
444 | + $data_to_delete[ $field[ 'id' ] ] = ''; |
|
445 | 445 | } |
446 | 446 | |
447 | 447 | $this->cmb->save_fields( $term_id, 'term', $data_to_delete ); |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | return; |
505 | 505 | } |
506 | 506 | |
507 | - self::$hooks_completed[] = $key; |
|
507 | + self::$hooks_completed[ ] = $key; |
|
508 | 508 | add_filter( $action, $hook, $priority, $accepted_args ); |
509 | 509 | } |
510 | 510 |
@@ -357,6 +357,7 @@ discard block |
||
357 | 357 | /** |
358 | 358 | * Gets the values for the `file` field type from the data being saved. |
359 | 359 | * @since 2.2.0 |
360 | + * @param string $id_key |
|
360 | 361 | */ |
361 | 362 | public function _get_group_file_value_array( $id_key ) { |
362 | 363 | $alldata = $this->field->group->data_to_save; |
@@ -378,6 +379,7 @@ discard block |
||
378 | 379 | /** |
379 | 380 | * Peforms saving of `file` attachement's ID |
380 | 381 | * @since 1.1.0 |
382 | + * @param string $file_id_key |
|
381 | 383 | */ |
382 | 384 | public function _save_file_id_value( $file_id_key ) { |
383 | 385 | $id_field = $this->_new_supporting_field( $file_id_key ); |
@@ -398,6 +400,7 @@ discard block |
||
398 | 400 | /** |
399 | 401 | * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp |
400 | 402 | * @since 2.2.0 |
403 | + * @param string $utc_key |
|
401 | 404 | */ |
402 | 405 | public function _save_utc_value( $utc_key, $utc_stamp ) { |
403 | 406 | return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp ); |
@@ -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 | } |
@@ -175,7 +175,7 @@ |
||
175 | 175 | * Combines attributes into a string for a form element |
176 | 176 | * @since 1.1.0 |
177 | 177 | * @param array $attrs Attributes to concatenate |
178 | - * @param array $attr_exclude Attributes that should NOT be concatenated |
|
178 | + * @param string[] $attr_exclude Attributes that should NOT be concatenated |
|
179 | 179 | * @return string String of attributes for form element |
180 | 180 | */ |
181 | 181 | public function concat_attrs( $attrs, $attr_exclude = array() ) { |
@@ -200,8 +200,8 @@ discard block |
||
200 | 200 | */ |
201 | 201 | public function concat_items( $args = array() ) { |
202 | 202 | |
203 | - $method = isset( $args['method'] ) ? $args['method'] : 'select_option'; |
|
204 | - unset( $args['method'] ); |
|
203 | + $method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option'; |
|
204 | + unset( $args[ 'method' ] ); |
|
205 | 205 | |
206 | 206 | $value = $this->field->escaped_value() |
207 | 207 | ? $this->field->escaped_value() |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | // Clone args & modify for just this item |
220 | 220 | $a = $args; |
221 | 221 | |
222 | - $a['value'] = $opt_value; |
|
223 | - $a['label'] = $opt_label; |
|
222 | + $a[ 'value' ] = $opt_value; |
|
223 | + $a[ 'label' ] = $opt_label; |
|
224 | 224 | |
225 | 225 | // Check if this option is the value of the input |
226 | 226 | if ( $value == $opt_value ) { |
227 | - $a['checked'] = 'checked'; |
|
227 | + $a[ 'checked' ] = 'checked'; |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | $concatenated_items .= $this->$method( $a, $i++ ); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @return string Generated option element html |
241 | 241 | */ |
242 | 242 | public function select_option( $args = array() ) { |
243 | - return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n"; |
|
243 | + return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n"; |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | 'label' => '', |
261 | 261 | ) ); |
262 | 262 | |
263 | - return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] ); |
|
263 | + return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] ); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | /** |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | */ |
273 | 273 | public function list_input_checkbox( $args, $i ) { |
274 | 274 | $saved_value = $this->field->escaped_value(); |
275 | - if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) { |
|
276 | - $args['checked'] = 'checked'; |
|
275 | + if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) { |
|
276 | + $args[ 'checked' ] = 'checked'; |
|
277 | 277 | } |
278 | - $args['type'] = 'checkbox'; |
|
278 | + $args[ 'type' ] = 'checkbox'; |
|
279 | 279 | return $this->list_input( $args, $i ); |
280 | 280 | } |
281 | 281 | |
@@ -426,11 +426,11 @@ discard block |
||
426 | 426 | 'js_dependencies' => array(), |
427 | 427 | ) ); |
428 | 428 | |
429 | - if ( ! empty( $a['js_dependencies'] ) ) { |
|
430 | - CMB2_JS::add_dependencies( $a['js_dependencies'] ); |
|
429 | + if ( ! empty( $a[ 'js_dependencies' ] ) ) { |
|
430 | + CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] ); |
|
431 | 431 | } |
432 | 432 | |
433 | - return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] ); |
|
433 | + return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] ); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | /** |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | 'value' => $this->field->escaped_value( 'esc_textarea' ), |
450 | 450 | 'desc' => $this->_desc( true ), |
451 | 451 | ) ); |
452 | - return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] ); |
|
452 | + return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] ); |
|
453 | 453 | } |
454 | 454 | |
455 | 455 | /** |
@@ -500,8 +500,8 @@ discard block |
||
500 | 500 | 'options' => $this->field->options(), |
501 | 501 | ) ); |
502 | 502 | |
503 | - wp_editor( $a['value'], $a['id'], $a['options'] ); |
|
504 | - echo $a['desc']; |
|
503 | + wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] ); |
|
504 | + echo $a[ 'desc' ]; |
|
505 | 505 | } |
506 | 506 | |
507 | 507 | public function text_date( $args = array() ) { |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ), |
513 | 513 | ) ); |
514 | 514 | |
515 | - if ( false === strpos( $args['class'], 'timepicker' ) ) { |
|
515 | + if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) { |
|
516 | 516 | $this->parse_picker_options( 'date' ); |
517 | 517 | } |
518 | 518 | |
@@ -544,34 +544,34 @@ discard block |
||
544 | 544 | 'timepicker' => array(), |
545 | 545 | ) ); |
546 | 546 | |
547 | - if ( empty( $args['value'] ) ) { |
|
548 | - $args['value'] = $this->field->escaped_value(); |
|
547 | + if ( empty( $args[ 'value' ] ) ) { |
|
548 | + $args[ 'value' ] = $this->field->escaped_value(); |
|
549 | 549 | // This will be used if there is a select_timezone set for this field |
550 | 550 | $tz_offset = $this->field->field_timezone_offset(); |
551 | 551 | if ( ! empty( $tz_offset ) ) { |
552 | - $args['value'] -= $tz_offset; |
|
552 | + $args[ 'value' ] -= $tz_offset; |
|
553 | 553 | } |
554 | 554 | } |
555 | 555 | |
556 | - $has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] ); |
|
556 | + $has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] ); |
|
557 | 557 | |
558 | - $date_args = wp_parse_args( $args['datepicker'], array( |
|
558 | + $date_args = wp_parse_args( $args[ 'datepicker' ], array( |
|
559 | 559 | 'class' => 'cmb2-text-small cmb2-datepicker', |
560 | 560 | 'name' => $this->_name( '[date]' ), |
561 | 561 | 'id' => $this->_id( '_date' ), |
562 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '', |
|
562 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '', |
|
563 | 563 | 'desc' => '', |
564 | 564 | ) ); |
565 | 565 | |
566 | 566 | // Let's get the date-format, and set it up as a data attr for the field. |
567 | 567 | $date_args = $this->parse_picker_options( 'date', $date_args ); |
568 | 568 | |
569 | - $time_args = wp_parse_args( $args['timepicker'], array( |
|
569 | + $time_args = wp_parse_args( $args[ 'timepicker' ], array( |
|
570 | 570 | 'class' => 'cmb2-timepicker text-time', |
571 | 571 | 'name' => $this->_name( '[time]' ), |
572 | 572 | 'id' => $this->_id( '_time' ), |
573 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '', |
|
574 | - 'desc' => $args['desc'], |
|
573 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '', |
|
574 | + 'desc' => $args[ 'desc' ], |
|
575 | 575 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ), |
576 | 576 | ) ); |
577 | 577 | |
@@ -589,12 +589,12 @@ discard block |
||
589 | 589 | 'select_timezone' => array(), |
590 | 590 | ) ); |
591 | 591 | |
592 | - $args['value'] = $this->field->escaped_value(); |
|
593 | - if ( is_array( $args['value'] ) ) { |
|
594 | - $args['value'] = ''; |
|
592 | + $args[ 'value' ] = $this->field->escaped_value(); |
|
593 | + if ( is_array( $args[ 'value' ] ) ) { |
|
594 | + $args[ 'value' ] = ''; |
|
595 | 595 | } |
596 | 596 | |
597 | - $datetime = maybe_unserialize( $args['value'] ); |
|
597 | + $datetime = maybe_unserialize( $args[ 'value' ] ); |
|
598 | 598 | $value = $tzstring = ''; |
599 | 599 | |
600 | 600 | if ( $datetime && $datetime instanceof DateTime ) { |
@@ -603,24 +603,24 @@ discard block |
||
603 | 603 | $value = $datetime->getTimestamp(); |
604 | 604 | } |
605 | 605 | |
606 | - $timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array( |
|
606 | + $timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array( |
|
607 | 607 | 'desc' => '', |
608 | 608 | 'value' => $value, |
609 | 609 | ) ); |
610 | 610 | |
611 | - $timezone_args = wp_parse_args( $args['select_timezone'], array( |
|
611 | + $timezone_args = wp_parse_args( $args[ 'select_timezone' ], array( |
|
612 | 612 | 'class' => 'cmb2_select cmb2-select-timezone', |
613 | 613 | 'name' => $this->_name( '[timezone]' ), |
614 | 614 | 'id' => $this->_id( '_timezone' ), |
615 | 615 | 'options' => wp_timezone_choice( $tzstring ), |
616 | - 'desc' => $args['desc'], |
|
616 | + 'desc' => $args[ 'desc' ], |
|
617 | 617 | ) ); |
618 | 618 | |
619 | 619 | return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args ); |
620 | 620 | } |
621 | 621 | |
622 | 622 | public function select_timezone() { |
623 | - $this->field->args['default'] = $this->field->args( 'default' ) |
|
623 | + $this->field->args[ 'default' ] = $this->field->args( 'default' ) |
|
624 | 624 | ? $this->field->args( 'default' ) |
625 | 625 | : cmb2_utils()->timezone_string(); |
626 | 626 | |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | 'desc' => $this->_desc( true ), |
663 | 663 | ) ); |
664 | 664 | |
665 | - return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] ); |
|
665 | + return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] ); |
|
666 | 666 | } |
667 | 667 | |
668 | 668 | public function select( $args = array() ) { |
@@ -675,17 +675,17 @@ discard block |
||
675 | 675 | ) ); |
676 | 676 | |
677 | 677 | $attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) ); |
678 | - return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] ); |
|
678 | + return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] ); |
|
679 | 679 | } |
680 | 680 | |
681 | 681 | public function taxonomy_select() { |
682 | 682 | |
683 | 683 | $names = $this->get_object_terms(); |
684 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug; |
|
684 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug; |
|
685 | 685 | $terms = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' ); |
686 | 686 | $options = ''; |
687 | 687 | |
688 | - $option_none = $this->field->args( 'show_option_none' ); |
|
688 | + $option_none = $this->field->args( 'show_option_none' ); |
|
689 | 689 | if ( ! empty( $option_none ) ) { |
690 | 690 | $option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' ); |
691 | 691 | $option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value ); |
@@ -715,7 +715,7 @@ discard block |
||
715 | 715 | 'desc' => $this->_desc( true ), |
716 | 716 | ) ); |
717 | 717 | |
718 | - return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] ); |
|
718 | + return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] ); |
|
719 | 719 | } |
720 | 720 | |
721 | 721 | public function radio_inline() { |
@@ -750,7 +750,7 @@ discard block |
||
750 | 750 | : $is_checked; |
751 | 751 | |
752 | 752 | if ( $is_checked ) { |
753 | - $defaults['checked'] = 'checked'; |
|
753 | + $defaults[ 'checked' ] = 'checked'; |
|
754 | 754 | } |
755 | 755 | |
756 | 756 | $args = $this->parse_args( $args, 'checkbox', $defaults ); |
@@ -760,14 +760,14 @@ discard block |
||
760 | 760 | |
761 | 761 | public function taxonomy_radio() { |
762 | 762 | $names = $this->get_object_terms(); |
763 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug; |
|
763 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug; |
|
764 | 764 | $terms = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' ); |
765 | 765 | $options = ''; $i = 1; |
766 | 766 | |
767 | 767 | if ( ! $terms ) { |
768 | 768 | $options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) ); |
769 | 769 | } else { |
770 | - $option_none = $this->field->args( 'show_option_none' ); |
|
770 | + $option_none = $this->field->args( 'show_option_none' ); |
|
771 | 771 | if ( ! empty( $option_none ) ) { |
772 | 772 | $option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) ); |
773 | 773 | $args = array( |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | 'label' => $option_none, |
776 | 776 | ); |
777 | 777 | if ( $saved_term == $option_none_value ) { |
778 | - $args['checked'] = 'checked'; |
|
778 | + $args[ 'checked' ] = 'checked'; |
|
779 | 779 | } |
780 | 780 | $options .= $this->list_input( $args, $i ); |
781 | 781 | $i++; |
@@ -788,7 +788,7 @@ discard block |
||
788 | 788 | ); |
789 | 789 | |
790 | 790 | if ( $saved_term == $term->slug ) { |
791 | - $args['checked'] = 'checked'; |
|
791 | + $args[ 'checked' ] = 'checked'; |
|
792 | 792 | } |
793 | 793 | $options .= $this->list_input( $args, $i ); |
794 | 794 | $i++; |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | ); |
826 | 826 | |
827 | 827 | if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) { |
828 | - $args['checked'] = 'checked'; |
|
828 | + $args[ 'checked' ] = 'checked'; |
|
829 | 829 | } |
830 | 830 | $options .= $this->list_input( $args, $i ); |
831 | 831 | $i++; |
@@ -930,7 +930,7 @@ discard block |
||
930 | 930 | $query_args = $this->field->args( 'query_args' ); |
931 | 931 | |
932 | 932 | // if options array and 'url' => false, then hide the url field |
933 | - $input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text'; |
|
933 | + $input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text'; |
|
934 | 934 | |
935 | 935 | echo $this->input( array( |
936 | 936 | 'type' => $input_type, |
@@ -951,8 +951,8 @@ discard block |
||
951 | 951 | // Reset field args for attachment ID |
952 | 952 | $args = $this->field->args(); |
953 | 953 | // If we're looking at a file in a group, we need to get the non-prefixed id |
954 | - $args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id'; |
|
955 | - unset( $args['_id'], $args['_name'] ); |
|
954 | + $args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id'; |
|
955 | + unset( $args[ '_id' ], $args[ '_name' ] ); |
|
956 | 956 | |
957 | 957 | // And get new field object |
958 | 958 | $this->field = new CMB2_Field( array( |
@@ -984,7 +984,7 @@ discard block |
||
984 | 984 | if ( $_id_value ) { |
985 | 985 | $image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) ); |
986 | 986 | } else { |
987 | - $size = is_array( $img_size ) ? $img_size[0] : 350; |
|
987 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 350; |
|
988 | 988 | $image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />'; |
989 | 989 | } |
990 | 990 | |
@@ -1015,11 +1015,11 @@ discard block |
||
1015 | 1015 | */ |
1016 | 1016 | public function img_status_output( $args ) { |
1017 | 1017 | printf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>', |
1018 | - $args['tag'], |
|
1019 | - $args['image'], |
|
1020 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
1018 | + $args[ 'tag' ], |
|
1019 | + $args[ 'image' ], |
|
1020 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
1021 | 1021 | esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ), |
1022 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
1022 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
1023 | 1023 | ); |
1024 | 1024 | } |
1025 | 1025 | |
@@ -1031,14 +1031,14 @@ discard block |
||
1031 | 1031 | */ |
1032 | 1032 | public function file_status_output( $args ) { |
1033 | 1033 | printf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span> (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>', |
1034 | - $args['tag'], |
|
1034 | + $args[ 'tag' ], |
|
1035 | 1035 | esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ), |
1036 | - $this->get_file_name_from_path( $args['value'] ), |
|
1037 | - $args['value'], |
|
1036 | + $this->get_file_name_from_path( $args[ 'value' ] ), |
|
1037 | + $args[ 'value' ], |
|
1038 | 1038 | esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ), |
1039 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
1039 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
1040 | 1040 | esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ), |
1041 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
1041 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
1042 | 1042 | ); |
1043 | 1043 | } |
1044 | 1044 | |
@@ -1060,8 +1060,8 @@ discard block |
||
1060 | 1060 | if ( $update ) { |
1061 | 1061 | $atts = $this->field->args( 'attributes' ); |
1062 | 1062 | } else { |
1063 | - $atts = isset( $args['attributes'] ) |
|
1064 | - ? $args['attributes'] |
|
1063 | + $atts = isset( $args[ 'attributes' ] ) |
|
1064 | + ? $args[ 'attributes' ] |
|
1065 | 1065 | : $atts; |
1066 | 1066 | } |
1067 | 1067 | |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | if ( $update ) { |
1080 | - $this->field->args['attributes'] = $atts; |
|
1080 | + $this->field->args[ 'attributes' ] = $atts; |
|
1081 | 1081 | } |
1082 | 1082 | |
1083 | 1083 | return array_merge( $args, $atts ); |
@@ -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' |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | * Get the bootstrap! If using the plugin from wordpress.org, REMOVE THIS! |
16 | 16 | */ |
17 | 17 | |
18 | -if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) { |
|
18 | +if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) { |
|
19 | 19 | require_once dirname( __FILE__ ) . '/cmb2/init.php'; |
20 | -} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) { |
|
20 | +} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) { |
|
21 | 21 | require_once dirname( __FILE__ ) . '/CMB2/init.php'; |
22 | 22 | } |
23 | 23 | |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | * |
29 | 29 | * @return bool True if metabox should show |
30 | 30 | */ |
31 | -function yourprefix_show_if_front_page( $cmb ) { |
|
31 | +function yourprefix_show_if_front_page( $cmb ) { |
|
32 | 32 | // Don't show this metabox if it's not the front page template |
33 | - if ( $cmb->object_id !== get_option( 'page_on_front' ) ) { |
|
33 | + if ( $cmb->object_id !== get_option( 'page_on_front' ) ) { |
|
34 | 34 | return false; |
35 | 35 | } |
36 | 36 | return true; |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @return bool True if metabox should show |
45 | 45 | */ |
46 | -function yourprefix_hide_if_no_cats( $field ) { |
|
46 | +function yourprefix_hide_if_no_cats( $field ) { |
|
47 | 47 | // Don't show this field if not in the cats category |
48 | - if ( ! has_tag( 'cats', $field->object_id ) ) { |
|
48 | + if ( ! has_tag( 'cats', $field->object_id ) ) { |
|
49 | 49 | return false; |
50 | 50 | } |
51 | 51 | return true; |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | * @param array $field_args Array of field parameters |
58 | 58 | * @param CMB2_Field object $field Field object |
59 | 59 | */ |
60 | -function yourprefix_before_row_if_2( $field_args, $field ) { |
|
61 | - if ( 2 == $field->object_id ) { |
|
60 | +function yourprefix_before_row_if_2( $field_args, $field ) { |
|
61 | + if ( 2 == $field->object_id ) { |
|
62 | 62 | echo '<p>Testing <b>"before_row"</b> parameter (on $post_id 2)</p>'; |
63 | - } else { |
|
63 | + } else { |
|
64 | 64 | echo '<p>Testing <b>"before_row"</b> parameter (<b>NOT</b> on $post_id 2)</p>'; |
65 | 65 | } |
66 | 66 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * Hook in and add a demo metabox. Can only happen on the 'cmb2_admin_init' or 'cmb2_init' hook. |
71 | 71 | */ |
72 | -function yourprefix_register_demo_metabox() { |
|
72 | +function yourprefix_register_demo_metabox() { |
|
73 | 73 | $prefix = 'yourprefix_demo_'; |
74 | 74 | |
75 | 75 | /** |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | /** |
373 | 373 | * Hook in and add a metabox that only appears on the 'About' page |
374 | 374 | */ |
375 | -function yourprefix_register_about_page_metabox() { |
|
375 | +function yourprefix_register_about_page_metabox() { |
|
376 | 376 | $prefix = 'yourprefix_about_'; |
377 | 377 | |
378 | 378 | /** |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | /** |
402 | 402 | * Hook in and add a metabox to demonstrate repeatable grouped fields |
403 | 403 | */ |
404 | -function yourprefix_register_repeatable_group_field_metabox() { |
|
404 | +function yourprefix_register_repeatable_group_field_metabox() { |
|
405 | 405 | $prefix = 'yourprefix_group_'; |
406 | 406 | |
407 | 407 | /** |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | /** |
466 | 466 | * Hook in and add a metabox to add fields to the user profile pages |
467 | 467 | */ |
468 | -function yourprefix_register_user_profile_metabox() { |
|
468 | +function yourprefix_register_user_profile_metabox() { |
|
469 | 469 | $prefix = 'yourprefix_user_'; |
470 | 470 | |
471 | 471 | /** |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | /** |
536 | 536 | * Hook in and add a metabox to add fields to taxonomy terms |
537 | 537 | */ |
538 | -function yourprefix_register_taxonomy_metabox() { |
|
538 | +function yourprefix_register_taxonomy_metabox() { |
|
539 | 539 | $prefix = 'yourprefix_term_'; |
540 | 540 | |
541 | 541 | /** |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | /** |
578 | 578 | * Hook in and register a metabox to handle a theme options page |
579 | 579 | */ |
580 | -function yourprefix_register_theme_options_metabox() { |
|
580 | +function yourprefix_register_theme_options_metabox() { |
|
581 | 581 | |
582 | 582 | $option_key = 'yourprefix_theme_options'; |
583 | 583 |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |