diff --git a/assets/css/um-members-rtl.min.css b/assets/css/um-members-rtl.min.css index 1b0630ad..e69de29b 100644 --- a/assets/css/um-members-rtl.min.css +++ b/assets/css/um-members-rtl.min.css @@ -1 +0,0 @@ -.um-directory .um-member-directory-header .um-member-directory-header-row.um-member-directory-search-row{justify-content:flex-start}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-search-line label{margin:0 0 0 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a a{margin:0 0 0 5px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-member-directory-sorting-a .um-new-dropdown{right:-12px;left:auto}.um-directory .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-filters .um-member-directory-filters-a a{margin:0 0 0 5px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input,.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input{margin:0 0 0 5px!important}.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-datepicker-filter-type input:nth-child(even),.um-directory .um-member-directory-header .um-member-directory-header-row .um-search .um-search-filter.um-timepicker-filter-type input:nth-child(even){margin:0 5px 0 0!important}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag{margin:0 0 5px 10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag:first-child{margin-left:10px}.um-directory .um-member-directory-header .um-member-directory-header-row .um-filtered-line .um-members-filter-tag .um-members-filter-remove{margin-left:0;margin-right:10px}.um-directory .um-members-wrapper .um-members.um-members-grid .um-member .um-member-card .um-members-edit-btn a.um-edit-profile-btn:before{margin-right:0;margin-left:8px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-photo{margin:0 0 0 15px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-content{margin:0 0 0 10px}.um-directory .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-container .um-member-card .um-member-card-actions .um-member-cog .um-new-dropdown{right:auto;left:0;text-align:right}.um-directory .um-members-pagination-box .um-members-pagi{align-items:center}.um-directory .um-members-pagination-box .um-members-pagi .pagi.pagi-arrow{transform:rotate(180deg)}.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 2px}.um-directory.uimob340 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-sorting .um-new-dropdown{right:auto;left:0}.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob340 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob500 .um-member-directory-header .um-member-directory-header-row .um-member-directory-nav-line .um-member-directory-view-type{margin:0 0 0 5px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer{align-items:flex-start}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob500 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper{margin:0 0 5px 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-photo{margin:0 0 0 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons{margin:0 0 0 10px}.um-directory.uimob800 .um-members-wrapper .um-members.um-members-list .um-member .um-member-card-footer .um-member-card-footer-buttons .um-members-list-footer-button-wrapper{margin:0 0 5px 10px} \ No newline at end of file diff --git a/assets/js/admin/common.js b/assets/js/admin/common.js index b5205380..abe7913b 100644 --- a/assets/js/admin/common.js +++ b/assets/js/admin/common.js @@ -97,7 +97,14 @@ UM.admin = { select2_atts.dropdownParent = $iconSelector.parents('._heading_text'); } - $iconSelector.select2( select2_atts ); + $iconSelector.select2( select2_atts ).on( 'change', function () { + // handle outdated icons and remove them after select new one. + let oldWrapper = $iconSelector.siblings('.um_admin_fonticon_wrapper'); + if ( oldWrapper.length > 0 ) { + oldWrapper.find('#_icon').val( $iconSelector.val() ); + oldWrapper.hide(); + } + }); } } } diff --git a/assets/js/admin/common.min.js b/assets/js/admin/common.min.js index d77b9554..a44e6a19 100644 --- a/assets/js/admin/common.min.js +++ b/assets/js/admin/common.min.js @@ -1 +1 @@ -"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin={tooltip:{all:null,init:function(){var t=jQuery(".um_tooltip");0 '+t.text+""):jQuery(' '+t.text+"")}n.length&&(t={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(t){return{search:t.term,action:"um_get_icons",page:t.page||1,nonce:um_admin_scripts.nonce}},processResults:function(t,n){n.page=n.page||1;var e=[];return t.data.icons&&jQuery.each(t.data.icons,function(t,n){e.push({id:t,text:n.label})}),{results:e,pagination:{more:50*n.page '+t.text+""):jQuery(' '+t.text+"")}var i;n.length&&(i={ajax:{url:wp.ajax.settings.url,dataType:"json",delay:250,data:function(t){return{search:t.term,action:"um_get_icons",page:t.page||1,nonce:um_admin_scripts.nonce}},processResults:function(t,n){n.page=n.page||1;var i=[];return t.data.icons&&jQuery.each(t.data.icons,function(t,n){i.push({id:t,text:n.label})}),{results:i,pagination:{more:50*n.page
'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()},contentRequest:function(n,a,i,d){let o="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(o=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:d,in_row:o,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();var i,a=jQuery(this).attr("data-modal");"UM_fonticons"===a&&""!==(i=jQuery(this).data("icon_field"))&&jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-icon_field",i),jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""===jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(UM.admin.modal.show(a,!0,jQuery(this).data("modal-size")),UM.admin.modal.contentRequest(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):UM.admin.modal.show(a)}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){let a="";var i=jQuery(this).attr("data-code");let n=!1;""!==i&&(jQuery(this).attr("data-modal")?(n=!0,a="#"+jQuery(this).attr("data-modal"),jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html(''),jQuery(a)):(a="#"+jQuery(this).data("icon_field"),jQuery(a).val(i).parent().find("span.um-admin-icon-value").html(''),jQuery(a).parent())).find(".um-admin-icon-clear").addClass("show"),jQuery(this).attr("data-code",""),n||(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).removeClass("show")}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-icons span",function(){var a=jQuery(this).attr("data-code");jQuery(this).parent().find("span").removeClass("highlighted"),jQuery(this).addClass("highlighted"),jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-code",a)})}); \ No newline at end of file +"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={getVisible:function(){return jQuery(".um-admin-modal:visible")},preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),jQuery("body").removeClass("um-admin-modal-open");var a=jQuery('.um-admin-modal div[id^="UM_"]');a.find(".um-admin-modal-body.um-admin-metabox").html("").attr("data-select2-id",null),a.hide().appendTo("body"),jQuery(".um-admin-modal,.um-admin-overlay").remove()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),wp.hooks.doAction("um_admin_modal_resize")},show:function(a,i,d){UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append('
'),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==i&&(UM.admin.modal.setSize(d),UM.admin.modal.preload()),UM.admin.modal.resize()},contentRequest:function(d,a,i,n){let o="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(o=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:d,arg1:a,arg2:i,arg3:n,in_row:o,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,d),UM.admin.tooltip.init()},error:function(a){}})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();var i,a=jQuery(this).attr("data-modal");"UM_fonticons"===a&&""!==(i=jQuery(this).data("icon_field"))&&jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-icon_field",i),jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""===jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(UM.admin.modal.show(a,!0,jQuery(this).data("modal-size")),UM.admin.modal.contentRequest(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):UM.admin.modal.show(a)}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){let a="";var i=jQuery(this).attr("data-code");let d=!1;""!==i&&(jQuery(this).attr("data-modal")?(d=!0,a="#"+jQuery(this).attr("data-modal"),jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html(''),jQuery(a)):(a="#"+jQuery(this).data("icon_field"),jQuery(a).val(i).parent().find("span.um-admin-icon-value").html(''),jQuery(a).parent())).find(".um-admin-icon-clear").addClass("show"),jQuery(this).attr("data-code",""),d||(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um_admin_fonticon_wrapper").hide(),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um_admin_fonticon_wrapper").hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()}),jQuery(document.body).on("click",".um-admin-icons span",function(){var a=jQuery(this).attr("data-code");jQuery(this).parent().find("span").removeClass("highlighted"),jQuery(this).addClass("highlighted"),jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-code",a)})}); \ No newline at end of file diff --git a/includes/admin/class-site-health.php b/includes/admin/class-site-health.php index 30406f7c..b2c67b1a 100644 --- a/includes/admin/class-site-health.php +++ b/includes/admin/class-site-health.php @@ -40,6 +40,14 @@ class Site_Health { ); } + $first_activation_date = get_option( 'um_first_activation_date', false ); + if ( ! empty( $first_activation_date ) && $first_activation_date < 1713342395 ) { + $tests['direct']['um_outdated_icons'] = array( + 'label' => esc_html__( 'Are the icons in Ultimate Member Forms and Settings out of date?', 'ultimate-member' ), + 'test' => array( $this, 'outdated_icons_test' ), + ); + } + return $tests; } @@ -77,6 +85,131 @@ class Site_Health { return $result; } + /** + * @return bool|array + */ + private function get_outdated_icons() { + $result = array( + 'description' => '', + 'actions' => '', + ); + + $old_icons = UM()->fonticons()->all; + + $forms = get_posts( + array( + 'post_type' => 'um_form', + 'posts_per_page' => -1, + 'fields' => 'ids', + ) + ); + + $forms_count = 0; + $break_forms = array(); + if ( ! empty( $forms ) ) { + foreach ( $forms as $form_id ) { + $fields = UM()->query()->get_attr( 'custom_fields', $form_id ); + if ( empty( $fields ) ) { + continue; + } + foreach ( $fields as $field ) { + if ( empty( $field['icon'] ) ) { + continue; + } + + if ( in_array( $field['icon'], $old_icons, true ) ) { + $break_forms[] = array( + 'id' => $form_id, + 'title' => get_the_title( $form_id ), + 'link' => get_edit_post_link( $form_id ), + ); + $forms_count++; + continue 2; + } + } + } + } + + if ( 0 < $forms_count ) { + $result['description'] .= sprintf( + '

%s

', + __( 'Your fields\' icons in the Ultimate Member Forms are out of date.', 'ultimate-member' ) + ); + + if ( ! empty( $break_forms ) ) { + $result['description'] .= sprintf( + '

%s', + __( 'Related to Ultimate Member Forms: ', 'ultimate-member' ) + ); + + $form_links = array(); + foreach ( $break_forms as $break_form ) { + $form_links[] = sprintf( + '%s (#ID: %s)', + esc_url( $break_form['link'] ), + esc_html( $break_form['title'] ), + esc_html( $break_form['id'] ) + ); + } + + $result['description'] .= sprintf( + '%s

', + implode( ', ', $form_links ) + ); + } + + $result['actions'] .= sprintf( + '

%s

', + admin_url( 'edit.php?post_type=um_form' ), + esc_html__( 'Edit form fields and update', 'ultimate-member' ) + ); + } + + $result = apply_filters( 'um_get_outdated_icons_result', $result, $old_icons ); + + if ( ! empty( $result['description'] ) ) { + $result['description'] .= sprintf( + '

%s

', + __( 'As soon as legacy icons will be removed old icons may break the website\'s functionality.', 'ultimate-member' ) + ); + } + + if ( ! empty( $result['description'] ) && ! empty( $result['actions'] ) ) { + return $result; + } + + return false; + } + + public function outdated_icons_test() { + $result = array( + 'label' => __( 'You have the most recent version of icons in Ultimate Member forms and settings', 'ultimate-member' ), + 'status' => 'good', + 'badge' => array( + 'label' => UM_PLUGIN_NAME, + 'color' => self::BADGE_COLOR, + ), + 'description' => sprintf( + '

%s

', + __( 'Your fields in the Ultimate Member Forms and settings have the most recent version and are ready to use.', 'ultimate-member' ) + ), + 'actions' => '', + 'test' => 'um_outdated_icons', + ); + + $outdated_icons = $this->get_outdated_icons(); + + if ( false !== $outdated_icons ) { + $result['label'] = __( 'Some field icons and (or) Ultimate Member settings icons are out of date', 'ultimate-member' ); + $result['status'] = 'recommended'; + $result['badge']['color'] = 'orange'; + $result['description'] = $outdated_icons['description']; + $result['actions'] = $outdated_icons['actions']; + } + + return $result; + } + private function get_roles() { return UM()->roles()->get_roles(); } diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php index 846741a8..31287848 100644 --- a/includes/admin/core/class-admin-forms.php +++ b/includes/admin/core/class-admin-forms.php @@ -545,7 +545,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) { $first_activation_date = get_option( 'um_first_activation_date', false ); // @todo new version - if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 || UM()->options()->get( 'enable_new_fonticons' ) ) { + if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 ) { UM()->setup()->set_icons_options(); $um_icons_list = get_option( 'um_icons_list' ); diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php index b9789fe1..c3ac0d39 100644 --- a/includes/admin/core/class-admin-metabox.php +++ b/includes/admin/core/class-admin-metabox.php @@ -1557,7 +1557,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { case '_icon': $first_activation_date = get_option( 'um_first_activation_date', false ); // @todo new version - if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 || UM()->options()->get( 'enable_new_fonticons' ) ) { + if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 ) { UM()->setup()->set_icons_options(); $um_icons_list = get_option( 'um_icons_list' ); @@ -1593,52 +1593,85 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { } } else { - if ( 'row' === $this->set_field_type ) { - $back = 'UM_edit_row'; - ?> -

- - - - edit_mode_value ) ) { ?> + UM()->setup()->set_icons_options(); - + $um_icons_list = get_option( 'um_icons_list' ); - edit_mode_value ) ) { ?> - - - - - -

- in_edit ) { - $back = 'UM_edit_field'; - } else { - $back = 'UM_add_field'; - } - ?> -
-

+ if ( empty( $this->edit_mode_value ) || array_key_exists( $this->edit_mode_value, $um_icons_list ) ) { + if ( 'row' === $this->set_field_type ) { + ?> + +

- - - - edit_mode_value ) ) { ?> - - - - edit_mode_value ) ) { ?> - - - - - +

-
- + +
+

+ + +

+
+ + set_field_type ) { + ?> + +

+ + + + + + + + +

+ + + +
+

+ + + + + + + + +

+
+ + __( 'Enable Gutenberg Blocks', 'ultimate-member' ), 'description' => __( 'Check this box if you would like to use Ultimate Member blocks in Gutenberg editor. Important some themes have the conflicts with Gutenberg editor.', 'ultimate-member' ), ), - array( - 'id' => 'enable_new_fonticons', - 'type' => 'checkbox', - 'label' => __( 'New fonticons', 'ultimate-member' ), - 'checkbox_label' => __( 'Enable new fonticons', 'ultimate-member' ), - 'description' => __( 'Check this box if you would like to enable new Ultimate Member fonticons used latest version of FontAwesome library.', 'ultimate-member' ), - ), $same_page_update, ), ), @@ -2229,12 +2222,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { } else { unset( $this->settings_structure['advanced']['sections']['features']['form_sections']['beta_features'] ); - - $first_activation_date = get_option( 'um_first_activation_date', false ); - // @todo new version - if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 ) { - unset( $this->settings_structure['advanced']['sections']['features']['form_sections']['features']['fields'][1] ); - } } } diff --git a/includes/admin/templates/modal/forms/fonticons.php b/includes/admin/templates/modal/forms/fonticons.php index 79a23918..efece25b 100644 --- a/includes/admin/templates/modal/forms/fonticons.php +++ b/includes/admin/templates/modal/forms/fonticons.php @@ -6,9 +6,7 @@ if ( ! defined( 'ABSPATH' ) ) { $first_activation_date = get_option( 'um_first_activation_date', false ); // @todo new version -if ( empty( $first_activation_date ) || $first_activation_date >= 1713342395 || UM()->options()->get( 'enable_new_fonticons' ) ) { - -} else { +if ( ! empty( $first_activation_date ) && $first_activation_date < 1713342395 ) { ?>