From 9da5cef5c5b8d25968361a582e1fb3433c35c374 Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Tue, 26 May 2020 12:49:18 +0300
Subject: [PATCH] - fixed PHP typo; - fixed links in the forms in a modal
 window; - minified scripts; - updated readme;

---
 assets/js/um-account.min.js         |  2 +-
 assets/js/um-conditional.min.js     |  2 +-
 assets/js/um-modal.js               |  2 +-
 assets/js/um-modal.min.js           |  2 +-
 includes/core/um-filters-fields.php |  2 +-
 readme.txt                          | 15 ++++++++++++++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/assets/js/um-account.min.js b/assets/js/um-account.min.js
index 3c7065b6..87fbfee5 100644
--- a/assets/js/um-account.min.js
+++ b/assets/js/um-account.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(){var a=jQuery(".um-account-main").attr("data-current_tab");a&&(jQuery('.um-account-tab[data-tab="'+a+'"]').show(),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0)),jQuery(document.body).on("click",".um-account-side li a",function(a){a.preventDefault();var e=jQuery(this);e.parents("ul").find("li a").removeClass("current"),e.addClass("current");var t=jQuery(this).attr("href"),u=jQuery(this).attr("data-tab");return jQuery('input[id="_um_account_tab"]:hidden').val(u),window.history.pushState("","",t),jQuery(".um-account-tab").hide(),jQuery('.um-account-tab[data-tab="'+u+'"]').fadeIn(),jQuery(".um-account-tab:visible").find("input, select, textarea").filter(".um_account_inactive:disabled").removeClass("um_account_inactive").prop("disabled",!1).attr("disabled",!1),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),jQuery(".um-account-nav a").removeClass("current"),jQuery('.um-account-nav a[data-tab="'+u+'"]').addClass("current"),!1}),jQuery(document.body).on("click",".um-account-nav a",function(a){a.preventDefault();var e=jQuery(this).attr("data-tab"),t=jQuery(this).parents("div"),u=jQuery(this);return jQuery('input[id="_um_account_tab"]:hidden').val(e),jQuery(".um-account-tab").hide(),u.hasClass("current")?(t.next(".um-account-tab").slideUp(),u.removeClass("current")):(t.next(".um-account-tab").slideDown(),u.parents("div").find("a").removeClass("current"),u.addClass("current")),jQuery(".um-account-tab:visible").find("input, select, textarea").filter(".um_account_inactive:disabled").removeClass("um_account_inactive").prop("disabled",!1).attr("disabled",!1),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),jQuery(".um-account-side li a").removeClass("current"),jQuery('.um-account-side li a[data-tab="'+e+'"]').addClass("current"),!1}),jQuery(document.body).on("click",".um-request-button",function(a){a.preventDefault();var e,t=jQuery(this).data("action"),u=jQuery("#"+t).val();jQuery(".um-field-area-response."+t).hide(),""===u?jQuery(".um-field-error."+t).show():(jQuery(".um-field-error."+t).hide(),e={request_action:t,password:u,nonce:um_scripts.nonce},wp.ajax.send("um_request_user_data",{data:e,success:function(a){jQuery(".um-field-area-response."+t).text(a.answer).show()},error:function(a){console.log(a)}}))})});
\ No newline at end of file
+jQuery(document).ready(function(){var a=jQuery(".um-account-main").attr("data-current_tab");a&&(jQuery('.um-account-tab[data-tab="'+a+'"]').show(),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0)),jQuery(document.body).on("click",".um-account-side li a",function(a){a.preventDefault();var e=jQuery(this);e.parents("ul").find("li a").removeClass("current"),e.addClass("current");var t=jQuery(this).attr("href"),u=jQuery(this).attr("data-tab");return jQuery('input[id="_um_account_tab"]:hidden').val(u),window.history.pushState("","",t),jQuery(".um-account-tab").hide(),jQuery('.um-account-tab[data-tab="'+u+'"]').fadeIn(),jQuery(".um-account-tab:visible").find("input, select, textarea").filter(".um_account_inactive:disabled").removeClass("um_account_inactive").prop("disabled",!1).attr("disabled",!1),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),jQuery(".um-account-nav a").removeClass("current"),jQuery('.um-account-nav a[data-tab="'+u+'"]').addClass("current"),!1}),jQuery(document.body).on("click",".um-account-nav a",function(a){a.preventDefault();var e=jQuery(this).attr("data-tab"),t=jQuery(this).parents("div"),u=jQuery(this);return jQuery('input[id="_um_account_tab"]:hidden').val(e),jQuery(".um-account-tab").hide(),u.hasClass("current")?(t.next(".um-account-tab").slideUp(),u.removeClass("current")):(t.next(".um-account-tab").slideDown(),u.parents("div").find("a").removeClass("current"),u.addClass("current")),jQuery(".um-account-tab:visible").find("input, select, textarea").filter(".um_account_inactive:disabled").removeClass("um_account_inactive").prop("disabled",!1).attr("disabled",!1),jQuery(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),jQuery(".um-account-side li a").removeClass("current"),jQuery('.um-account-side li a[data-tab="'+e+'"]').addClass("current"),!1}),jQuery(document.body).on("click",".um-request-button",function(a){a.preventDefault();var e=jQuery(this).data("action"),t=jQuery("#"+e).val();if(jQuery(".um-field-area-response."+e).hide(),""===t)jQuery(".um-field-error."+e).show();else{jQuery(".um-field-error."+e).hide();var u={request_action:e,password:t,nonce:um_scripts.nonce};wp.ajax.send("um_request_user_data",{data:u,success:function(a){jQuery(".um-field-area-response."+e).text(a.answer).show()},error:function(a){console.log(a)}})}})});
\ No newline at end of file
diff --git a/assets/js/um-conditional.min.js b/assets/js/um-conditional.min.js
index 3932c70e..ca8a80ab 100644
--- a/assets/js/um-conditional.min.js
+++ b/assets/js/um-conditional.min.js
@@ -1 +1 @@
-var arr_all_conditions=[],um_field_conditions={},um_field_default_values={};function um_get_field_default_value(e){var i,a="",t=um_get_field_type(e);switch(t){case"text":case"number":case"date":case"textarea":case"select":a=e.find("input:text,input[type=number],textarea,select").val();break;case"multiselect":case"user_tags":a=e.find("select").val();break;case"radio":1<=e.find("input[type=radio]:checked").length&&(a=e.find("input[type=radio]:checked").val());break;case"checkbox":1<=e.find("input[type=checkbox]:checked").length&&(a=1<e.find("input[type=checkbox]:checked").length?((i=[]).push(a),e.find("input[type=checkbox]:checked").each(function(){i.push(jQuery(this).val())}),i):e.find("input[type=checkbox]:checked").val())}return{type:t,value:a}}function um_get_field_element(e){switch(um_get_field_type(e)){case"text":case"number":case"date":case"textarea":case"select":case"multiselect":case"user_tags":case"radio":case"checkbox":return e.find("input,textarea,select")}return""}function um_get_field_type(e){var a="",i=e.attr("class").split(" ");return jQuery.each(i,function(e,i){/um-field-type_/.test(i)&&(a=i.replace("um-field-type_","").trim())}),a}function um_get_field_children(a){var t=[];return jQuery.each(arr_all_conditions,function(e,i){i.field.parent===a&&t.push(i.field.condition)}),t}function um_splitup_array(e,i){for(var a=e.length%i,t=a,n=Math.floor(e.length/i),u=[],r=0;r<e.length;r+=n){var c=n+r,d=!1;0!=a&&t&&(c++,t--,d=!0),u.push(e.slice(r,c)),d&&r++}var o=[];return jQuery.each(u,function(e,i){o.push({action:i[0],if_field:i[1],operator:i[2],value:i[3]})}),o}function um_get_field_data(e){return um_live_field=e.parents(".um-field").data("key"),um_live_value=e.val(),e.is(":checkbox")&&(um_live_value="",1<e.parents(".um-field").find("input:checked").length?e.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=e.parents(".um-field").find("input:checked").length&&(um_live_value=e.parents(".um-field").find("input:checked").val())),e.is(":radio")&&(um_live_value=e.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value}function um_in_array(e,i,a){var t,n=!1;for(t in a=!!a,i)if(a&&i[t]===e||!a&&i[t]==e){n=!0;break}return n}function um_apply_conditions(a,e){var i,t,n,u,r,c,d;a.parents(".um-field[data-key]").length&&(i=a.parents(".um-field[data-key]").data("key"),void 0!==(t=um_field_conditions[i])&&(n=um_get_field_type(a.parents(".um-field[data-key]")),u=um_get_field_data(a),r={},c={},d={},jQuery.each(t,function(e,i){void 0===c[i.owner]&&(c[i.owner]=[],d[i.owner]={}),c[i.owner].push(i.value),d[i.owner]=i}),jQuery.each(t,function(e,i){var a;if(void 0===r[i.owner]&&(r[i.owner]={}),"empty"===i.operator&&(a=jQuery.isArray(u)?u.join(""):u,r[i.owner][e]=!a||""===a),"not empty"===i.operator&&(a=jQuery.isArray(u)?u.join(""):u,r[i.owner][e]=!(!a||""===a)),"equals to"===i.operator&&(a=jQuery.isArray(u)&&1===u.length?u[0]:u,i.value===a&&um_in_array(a,c[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1),"not equals"===i.operator&&(a=jQuery.isArray(u)&&1===u.length?u[0]:u,(!jQuery.isNumeric(i.value)||parseInt(a)===parseInt(i.value)||!a||um_in_array(a,c[i.owner]))&&(i.value==a||um_in_array(a,c[i.owner]))?r[i.owner][e]=!1:r[i.owner][e]=!0),"greater than"===i.operator&&(a=jQuery.isArray(u)&&1===u.length?u[0]:u,jQuery.isNumeric(i.value)&&parseInt(a)>parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1),"less than"===i.operator&&(a=jQuery.isArray(u)&&1===u.length?u[0]:u,jQuery.isNumeric(i.value)&&parseInt(a)<parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1),"contains"===i.operator)switch(n){case"multiselect":case"user_tags":u&&0<=u.indexOf(i.value)&&um_in_array(i.value,u)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;case"checkbox":u&&0<=u.indexOf(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;default:u&&0<=u.indexOf(i.value)&&um_in_array(u,c[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1}}),jQuery.each(r,function(e,i){um_in_array(!0,i)?um_field_apply_action(a,d[e],!0):um_field_apply_action(a,d[e],!1)}),a.trigger("um_fields_change")))}function um_field_apply_action(e,i,a){var t=jQuery('div.um-field[data-key="'+i.owner+'"]');return"show"===i.action&&a&&(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),"show"!==i.action||a||(t.hide(),_hide_in_ie(t)),"hide"===i.action&&a&&(t.hide(),_hide_in_ie(t)),"hide"!==i.action||a||(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),e.removeClass("um-field-has-changed")}function um_field_restore_default_value(t){var e,i,a=um_get_field_type(t),n=t.data("key"),u=um_field_default_values[n];switch(a){case"text":case"number":case"date":case"textarea":t.find("input:text,input[type=number],textareas").val(u.value);break;case"select":t.find("select").find("option").prop("selected",!1),t.find("select").val(u.value),t.find("select").trigger("change");break;case"multiselect":case"user_tags":t.find("select").find("option").prop("selected",!1),jQuery.each(u.value,function(e,i){t.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),t.find("select").trigger("change");break;case"checkbox":1<=t.find("input[type=checkbox]:checked").length&&(t.find("input[type=checkbox]:checked").removeAttr("checked"),t.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),t.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),t.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(u.value)?jQuery.each(u.value,function(e,i){var a=t.find('input[type=checkbox][value="'+i+'"]');a.attr("checked",!0),a.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),a.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),a.closest(".um-field-checkbox").addClass("active")}):((e=t.find('input[type=checkbox][value="'+u.value+'"]')).attr("checked",!0),e.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),e.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),e.closest(".um-field-checkbox").addClass("active")));break;case"radio":1<=t.find("input[type=radio]:checked").length&&setTimeout(function(){t.find("input[type=radio]:checked").removeAttr("checked"),t.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),t.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),t.find(".um-field-radio.active").removeClass("active");var e=t.find("input[type=radio][value='"+u.value+"']");e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100)}t.hasClass("um-field-has-changed")||(i=um_get_field_element(t),"radio"!==a&&"checkbox"!==a||(i=i.find(":checked")),i&&(i.trigger("change"),t.addClass("um-field-has-changed")))}function um_field_hide_siblings(){jQuery.each(um_field_conditions,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"===jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function _hide_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function _show_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}function um_init_field_conditions(){var e=[];jQuery(".um-field[data-key]").each(function(){var t=jQuery(this).data("key");e.push(t);var u={};jQuery.each(jQuery(this)[0].attributes,function(e,i){var a,t,n;-1!==i.name.indexOf("data-cond")&&(t=(a=i.name.slice(10)).substring(1,0),n=a.slice(2),void 0===u[t]&&(u[t]={}),u[t][n]=i.value)}),jQuery.each(u,function(e,i){var a={field:{owner:t,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:t,action:i.action,operator:i.operator,value:i.value}}};arr_all_conditions.push(a)}),um_field_default_values[jQuery(this).data("key")]=um_get_field_default_value(jQuery(this))}),jQuery.each(e,function(e,i){um_field_conditions[i]=um_get_field_children(i)}),jQuery(".um-field[data-key]:visible").each(function(){var e=um_get_field_element(jQuery(this));void 0!==e.trigger&&e.trigger("change")})}jQuery(document).ready(function(){jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("um_fields_change",function(){um_field_hide_siblings(),um_field_hide_siblings()}),um_init_field_conditions()});
\ No newline at end of file
+var arr_all_conditions=[],um_field_conditions={},um_field_default_values={};function um_get_field_default_value(e){var i="",a=um_get_field_type(e);switch(a){case"text":case"number":case"date":case"textarea":case"select":i=e.find("input:text,input[type=number],textarea,select").val();break;case"multiselect":case"user_tags":i=e.find("select").val();break;case"radio":1<=e.find("input[type=radio]:checked").length&&(i=e.find("input[type=radio]:checked").val());break;case"checkbox":if(1<=e.find("input[type=checkbox]:checked").length)if(1<e.find("input[type=checkbox]:checked").length){var t=[];t.push(i),e.find("input[type=checkbox]:checked").each(function(){t.push(jQuery(this).val())}),i=t}else i=e.find("input[type=checkbox]:checked").val()}return{type:a,value:i}}function um_get_field_element(e){switch(um_get_field_type(e)){case"text":case"number":case"date":case"textarea":case"select":case"multiselect":case"user_tags":case"radio":case"checkbox":return e.find("input,textarea,select")}return""}function um_get_field_type(e){var a="",i=e.attr("class").split(" ");return jQuery.each(i,function(e,i){/um-field-type_/.test(i)&&(a=i.replace("um-field-type_","").trim())}),a}function um_get_field_children(a){var t=[];return jQuery.each(arr_all_conditions,function(e,i){i.field.parent===a&&t.push(i.field.condition)}),t}function um_splitup_array(e,i){for(var a=e.length%i,t=a,n=Math.floor(e.length/i),u=[],r=0;r<e.length;r+=n){var c=n+r,o=!1;0!==a&&t&&(c++,t--,o=!0),u.push(e.slice(r,c)),o&&r++}var d=[];return jQuery.each(u,function(e,i){d.push({action:i[0],if_field:i[1],operator:i[2],value:i[3]})}),d}function um_get_field_data(e){return um_live_field=e.parents(".um-field").data("key"),um_live_value=e.val(),e.is(":checkbox")&&(um_live_value="",1<e.parents(".um-field").find("input:checked").length?e.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=e.parents(".um-field").find("input:checked").length&&(um_live_value=e.parents(".um-field").find("input:checked").val())),e.is(":radio")&&(um_live_value=e.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value}function um_in_array(e,i,a){var t,n=!1;for(t in a=!!a,i)if(a&&i[t]===e||!a&&i[t]==e){n=!0;break}return n}function um_apply_conditions(a,e){if(a.parents(".um-field[data-key]").length){var i=a.parents(".um-field[data-key]").data("key"),t=um_field_conditions[i];if(void 0!==t){var n=um_get_field_type(a.parents(".um-field[data-key]")),u=um_get_field_data(a),r={},c={},o={};jQuery.each(t,function(e,i){void 0===c[i.owner]&&(c[i.owner]=[],o[i.owner]={}),c[i.owner].push(i.value),o[i.owner]=i}),jQuery.each(t,function(e,i){if(void 0===r[i.owner]&&(r[i.owner]={}),"empty"===i.operator){var a=jQuery.isArray(u)?u.join(""):u;r[i.owner][e]=!a||""===a}if("not empty"===i.operator){a=jQuery.isArray(u)?u.join(""):u;r[i.owner][e]=!(!a||""===a)}if("equals to"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;i.value===a&&um_in_array(a,c[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1}if("not equals"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)!==parseInt(i.value)&&a&&!um_in_array(a,c[i.owner])?r[i.owner][e]=!0:i.value==a||um_in_array(a,c[i.owner])?r[i.owner][e]=!1:r[i.owner][e]=!0}if("greater than"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)>parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1}if("less than"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)<parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1}if("contains"===i.operator)switch(n){case"multiselect":case"user_tags":u&&0<=u.indexOf(i.value)&&um_in_array(i.value,u)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;case"checkbox":u&&0<=u.indexOf(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;default:u&&0<=u.indexOf(i.value)&&um_in_array(u,c[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1}}),jQuery.each(r,function(e,i){um_in_array(!0,i)?um_field_apply_action(a,o[e],!0):um_field_apply_action(a,o[e],!1)}),a.trigger("um_fields_change")}}}function um_field_apply_action(e,i,a){var t=jQuery('div.um-field[data-key="'+i.owner+'"]');return"show"===i.action&&a&&(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),"show"!==i.action||a||(t.hide(),_hide_in_ie(t)),"hide"===i.action&&a&&(t.hide(),_hide_in_ie(t)),"hide"!==i.action||a||(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),e.removeClass("um-field-has-changed")}function um_field_restore_default_value(t){var e=um_get_field_type(t),i=t.data("key"),a=um_field_default_values[i];switch(e){case"text":case"number":case"date":case"textarea":t.find("input:text,input[type=number],textareas").val(a.value);break;case"select":t.find("select").find("option").prop("selected",!1),t.find("select").val(a.value),t.find("select").trigger("change");break;case"multiselect":case"user_tags":t.find("select").find("option").prop("selected",!1),jQuery.each(a.value,function(e,i){t.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),t.find("select").trigger("change");break;case"checkbox":if(1<=t.find("input[type=checkbox]:checked").length)if(t.find("input[type=checkbox]:checked").removeAttr("checked"),t.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),t.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),t.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(a.value))jQuery.each(a.value,function(e,i){var a=t.find('input[type=checkbox][value="'+i+'"]');a.attr("checked",!0),a.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),a.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),a.closest(".um-field-checkbox").addClass("active")});else{var n=t.find('input[type=checkbox][value="'+a.value+'"]');n.attr("checked",!0),n.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),n.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),n.closest(".um-field-checkbox").addClass("active")}break;case"radio":1<=t.find("input[type=radio]:checked").length&&setTimeout(function(){t.find("input[type=radio]:checked").removeAttr("checked"),t.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),t.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),t.find(".um-field-radio.active").removeClass("active");var e=t.find("input[type=radio][value='"+a.value+"']");e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100)}if(!t.hasClass("um-field-has-changed")){var u=um_get_field_element(t);"radio"!==e&&"checkbox"!==e||(u=u.find(":checked")),u&&(u.trigger("change"),t.addClass("um-field-has-changed"))}}function um_field_hide_siblings(){jQuery.each(um_field_conditions,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"===jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function _hide_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function _show_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}function um_init_field_conditions(){var e=[];jQuery(".um-field[data-key]").each(function(){var t=jQuery(this).data("key");e.push(t);var u={};jQuery.each(jQuery(this)[0].attributes,function(e,i){if(-1!==i.name.indexOf("data-cond")){var a=i.name.slice(10),t=a.substring(1,0),n=a.slice(2);void 0===u[t]&&(u[t]={}),u[t][n]=i.value}}),jQuery.each(u,function(e,i){var a={field:{owner:t,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:t,action:i.action,operator:i.operator,value:i.value}}};arr_all_conditions.push(a)}),um_field_default_values[jQuery(this).data("key")]=um_get_field_default_value(jQuery(this))}),jQuery.each(e,function(e,i){um_field_conditions[i]=um_get_field_children(i)}),jQuery(".um-field[data-key]:visible").each(function(){var e=um_get_field_element(jQuery(this));void 0!==e.trigger&&e.trigger("change")})}jQuery(document).ready(function(){jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("um_fields_change",function(){um_field_hide_siblings(),um_field_hide_siblings()}),um_init_field_conditions()});
\ No newline at end of file
diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js
index 90720346..e7133d3d 100644
--- a/assets/js/um-modal.js
+++ b/assets/js/um-modal.js
@@ -9,7 +9,7 @@ jQuery(document).ready(function() {
 		um_remove_modal();
 	});
 
-	jQuery(document).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a', function(e){
+	jQuery(document).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal:not(:has(.um-form)) a', function(e){
 		e.preventDefault();
 		return false;
 	});
diff --git a/assets/js/um-modal.min.js b/assets/js/um-modal.min.js
index e540a7eb..3fb03276 100644
--- a/assets/js/um-modal.min.js
+++ b/assets/js/um-modal.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(){jQuery(document).on("click",".um-popup-overlay",function(){remove_Modal()}),jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a',function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-modal .um-single-file-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-fileinfo a").attr("href"),i=a.find(".um-single-file-upload").data("set_mode");return jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,mode:i,nonce:um_scripts.nonce},success:function(){a.find(".um-single-file-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}),!1}),jQuery(document).on("click",".um-modal .um-single-image-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview img").attr("src"),i=a.find(".um-single-image-upload").data("set_mode");return jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,mode:i,nonce:um_scripts.nonce},success:function(){jQuery("img.cropper-hidden").cropper("destroy"),a.find(".um-single-image-preview img").attr("src",""),a.find(".um-single-image-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}),!1}),jQuery(document).on("click",".um-finish-upload.file:not(.disabled)",function(){var e=jQuery(this).attr("data-key"),a=jQuery(this).parents(".um-modal-body").find(".um-single-file-preview").html();um_remove_modal(),jQuery(".um-single-file-preview[data-key="+e+"]").fadeIn().html(a);var t=jQuery(".um-field[data-key="+e+"]").find(".um-single-fileinfo a").data("file");jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find(".um-btn-auto-width").html(jQuery(this).attr("data-change")),jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find('input[type="hidden"]').val(t)}),jQuery(document).on("click",".um-finish-upload.image:not(.disabled)",function(){var a=jQuery(this),t=jQuery(this).attr("data-key"),e=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview"),i=e.find("img").attr("src"),r=e.attr("data-coord"),u=e.find("img").data("file"),n=0;jQuery(this).parents("#um_upload_single").data("user_id")&&(n=jQuery(this).parents("#um_upload_single").data("user_id"));var m=0,o="";if(1===jQuery('div.um-field-image[data-key="'+t+'"]').length){var s=jQuery('div.um-field-image[data-key="'+t+'"]').closest(".um-form");m=s.find('input[name="form_id"]').val(),o=s.attr("data-mode")}r?(jQuery(this).html(jQuery(this).attr("data-processing")).addClass("disabled"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_resize_image",src:i,coord:r,user_id:n,key:t,set_id:m,set_mode:o,nonce:um_scripts.nonce},success:function(e){e.success&&(d=new Date,"profile_photo"===t?jQuery(".um-profile-photo-img img").attr("src",e.data.image.source_url+"?"+d.getTime()):"cover_photo"===t&&(jQuery(".um-cover-e").empty().html('<img src="'+e.data.image.source_url+"?"+d.getTime()+'" alt="" />'),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0<jQuery("input[type=hidden][name='user_id']").length&&jQuery("#"+a).attr("data-user_id",jQuery("input[type=hidden][name='user_id']").val())),um_new_modal(a,t)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(document).on("click",".um-popup-overlay",function(){remove_Modal()}),jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal:not(:has(.um-form)) a',function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-modal .um-single-file-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-fileinfo a").attr("href"),i=a.find(".um-single-file-upload").data("set_mode");return jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,mode:i,nonce:um_scripts.nonce},success:function(){a.find(".um-single-file-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}),!1}),jQuery(document).on("click",".um-modal .um-single-image-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview img").attr("src"),i=a.find(".um-single-image-upload").data("set_mode");return jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,mode:i,nonce:um_scripts.nonce},success:function(){jQuery("img.cropper-hidden").cropper("destroy"),a.find(".um-single-image-preview img").attr("src",""),a.find(".um-single-image-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive()}}),!1}),jQuery(document).on("click",".um-finish-upload.file:not(.disabled)",function(){var e=jQuery(this).attr("data-key"),a=jQuery(this).parents(".um-modal-body").find(".um-single-file-preview").html();um_remove_modal(),jQuery(".um-single-file-preview[data-key="+e+"]").fadeIn().html(a);var t=jQuery(".um-field[data-key="+e+"]").find(".um-single-fileinfo a").data("file");jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find(".um-btn-auto-width").html(jQuery(this).attr("data-change")),jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find('input[type="hidden"]').val(t)}),jQuery(document).on("click",".um-finish-upload.image:not(.disabled)",function(){var a=jQuery(this),t=jQuery(this).attr("data-key"),e=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview"),i=e.find("img").attr("src"),r=e.attr("data-coord"),u=e.find("img").data("file"),m=0;jQuery(this).parents("#um_upload_single").data("user_id")&&(m=jQuery(this).parents("#um_upload_single").data("user_id"));var n=0,o="";if(1===jQuery('div.um-field-image[data-key="'+t+'"]').length){var s=jQuery('div.um-field-image[data-key="'+t+'"]').closest(".um-form");n=s.find('input[name="form_id"]').val(),o=s.attr("data-mode")}r?(jQuery(this).html(jQuery(this).attr("data-processing")).addClass("disabled"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_resize_image",src:i,coord:r,user_id:m,key:t,set_id:n,set_mode:o,nonce:um_scripts.nonce},success:function(e){e.success&&(d=new Date,"profile_photo"===t?jQuery(".um-profile-photo-img img").attr("src",e.data.image.source_url+"?"+d.getTime()):"cover_photo"===t&&(jQuery(".um-cover-e").empty().html('<img src="'+e.data.image.source_url+"?"+d.getTime()+'" alt="" />'),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0<jQuery("input[type=hidden][name='user_id']").length&&jQuery("#"+a).attr("data-user_id",jQuery("input[type=hidden][name='user_id']").val())),um_new_modal(a,t)})});
\ No newline at end of file
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index 414bfdc7..a81168cc 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -722,7 +722,7 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) {
 			 */
 			$option_pairs = apply_filters( 'um_select_options_pair', null, $data );
 
-			$arr = empty( $data['options'] ) ? array() : $data['options'];;
+			$arr = empty( $data['options'] ) ? array() : $data['options'];
 			if ( $option_pairs ) {
 				$arr = array_keys( $arr );
 			}
diff --git a/readme.txt b/readme.txt
index acd2aefe..f1b6a1ff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -149,11 +149,24 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
 
 * Enhancements:
 
-  - Added filter to the field's privacy option for the 3rd-party integrations
+  - Added filter to the field's privacy option for the 3rd-party integrations 'um_field_privacy_options'
+  - Added layout changes to show email notification description in Settings > Email screen
+  - Added member directory option 'Exclude specific users'
+  - Added filter for the changing redirect after profile edited 'um_update_profile_redirect_after'
+  - Tweak: apply_shortcodes() function support
 
 * Bugfixes:
 
+  - Fixed custom meta table fields migration (create, edit, remove field actions)
   - Fixed wp-login.php and UM login form validation/errors triggers when using email for login
+  - Fixed profile form duplicates, show only the first form shortcode on the page for the user with selected role
+  - Fixed creating user uploads directory on registration
+  - Fixed Role fields validation on registration
+  - Fixed Erase User Data field on the Account page
+  - Fixed SkypeID field
+  - Fixed clickable links in the UM forms which are displayed in a modal window
+  - Fixed some translations
+  - Small PHP notices fixes
 
 = 2.1.5: April 2, 2020 =