From cf47a578a7e1fa864a324e4c0a05f3de3b1db93a Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Wed, 4 Sep 2019 16:09:55 +0300 Subject: [PATCH 1/4] - fix warning member directory - enable search member directory by default --- includes/class-config.php | 2 +- includes/core/class-member-directory.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/class-config.php b/includes/class-config.php index 5059c977..09ef157e 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -145,7 +145,7 @@ if ( ! class_exists( 'um\Config' ) ) { '_um_show_social' => 0, '_um_show_userinfo' => 0, '_um_show_tagline' => 0, - '_um_search' => 0, + '_um_search' => 1, '_um_userinfo_animate' => '1', '_um_sortby' => 'user_registered_desc', '_um_profile_photo' => '1', diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index 913a030e..4fc11784 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -275,12 +275,14 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { $this->filter_supported_fields = apply_filters( 'um_members_directory_custom_field_types_supported_filter', array( 'date', 'time', 'select', 'multiselect', 'radio', 'checkbox', 'rating' ) ); - foreach ( UM()->builtin()->saved_fields as $key => $data ) { - if ( isset( $data['type'] ) && in_array( $data['type'], $this->filter_supported_fields ) ) { - if ( isset( $data['title'] ) && array_search( $data['title'], $this->filter_fields ) !== false ) { - $data['title'] = $data['title'] . ' (' . $key . ')'; + if ( UM()->builtin()->saved_fields ) { + foreach ( UM()->builtin()->saved_fields as $key => $data ) { + if ( isset( $data['type'] ) && in_array( $data['type'], $this->filter_supported_fields ) ) { + if ( isset( $data['title'] ) && array_search( $data['title'], $this->filter_fields ) !== false ) { + $data['title'] = $data['title'] . ' (' . $key . ')'; + } + $this->filter_fields[ $key ] = isset( $data['title'] ) ? $data['title'] : $data['label']; } - $this->filter_fields[ $key ] = isset( $data['title'] ) ? $data['title'] : $data['label']; } } From 6ac94904e18e0a060cb20da4b68999b19e6115b9 Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Wed, 4 Sep 2019 16:27:08 +0300 Subject: [PATCH 2/4] - fix grid default --- includes/admin/templates/directory/general.php | 8 ++++---- templates/members.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/admin/templates/directory/general.php b/includes/admin/templates/directory/general.php index b516cb8d..5b13ac50 100644 --- a/includes/admin/templates/directory/general.php +++ b/includes/admin/templates/directory/general.php @@ -17,9 +17,9 @@ $show_these_users = get_post_meta( get_the_ID(), '_um_show_these_users', true ); if ( $show_these_users ) { $show_these_users = implode( "\n", str_replace( "\r", "", $show_these_users ) ); } - +$_um_view_types_options = array( 'grid', 'list' ); $_um_view_types_value = get_post_meta( $post_id, '_um_view_types', true ); -$_um_view_types_value = empty( $_um_view_types_value ) ? array( 'grid' ) : $_um_view_types_value; +$_um_view_types_value = empty( $_um_view_types_value ) ? array( 'grid', 'list' ) : $_um_view_types_value; $view_types_options = array_map( function( $item ) { return $item['title']; @@ -46,7 +46,7 @@ foreach ( $view_types_options as $key => $value ) { 'tooltip' => __( 'View type a specific parameter in the directory', 'ultimate-member' ), 'options' => $view_types_options, 'columns' => 3, - 'value' => $_um_view_types_value, + 'value' => $_um_view_types_options, 'data' => array( 'fill__um_default_view' => 'checkbox_key' ), ), array( @@ -55,7 +55,7 @@ foreach ( $view_types_options as $key => $value ) { 'label' => __( 'Default view type', 'ultimate-member' ), 'tooltip' => __( 'Default directory view type', 'ultimate-member' ), 'options' => $view_types_options, - 'value' => UM()->query()->get_meta_value( '_um_default_view', null, '' ), + 'value' => UM()->query()->get_meta_value( '_um_default_view', null, 'grid' ), 'conditional' => array( implode( '|', $conditional ), '~', 1 ) ), array( diff --git a/templates/members.php b/templates/members.php index fbf19b99..052e0f00 100644 --- a/templates/members.php +++ b/templates/members.php @@ -50,7 +50,7 @@ if ( count( $args['view_types'] ) == 1 ) { $default_sorting = ! empty( $args['sortby'] ) ? $args['sortby'] : 'user_registered_desc'; $sort_from_url = ''; -if ( $args['enable_sorting'] ) { +if ( isset( $args['enable_sorting'] ) ) { $sorting_options = empty( $args['sorting_fields'] ) ? array() : $args['sorting_fields']; if ( ! in_array( $default_sorting, $sorting_options ) ) { $sorting_options[] = $default_sorting; @@ -107,7 +107,7 @@ if ( ! $single_view ) { $classes .= ' um-member-with-view'; } -if ( $args['enable_sorting'] && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { +if ( isset( $args['enable_sorting'] ) && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { $classes .= ' um-member-with-sorting'; } @@ -141,7 +141,7 @@ UM()->get_template( 'members-pagination.php', '', $args, true ); ?> 1 ) { ?> + if ( isset( $args['enable_sorting'] ) && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { ?>