10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-18 14:13:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

- transfer User Tags conditional logic to extension, added JS hooks;

Browse Source
This commit is contained in:
nikitasinelnikov
2020-05-26 15:38:44 +03:00
parent 9da5cef5c5
commit 092b709d0f
5 changed files with 139 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-forms.php
+13 -2
View File
@@ -1362,6 +1362,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
}
/**
* @param $field_data
*
* @return string
*/
function render_md_default_filters( $field_data ) {
if ( empty( $field_data['id'] ) ) {
return false;
@@ -1445,6 +1450,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
}
/**
* @param $field_data
*
* @return string
*/
function render_md_sorting_fields( $field_data ) {
if ( empty( $field_data['id'] ) ) {
return false;
@@ -1560,6 +1570,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
return $html;
}
/**
* Get field value
*
@@ -1576,8 +1587,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$default = is_array( $field_data['default'] ) ? $field_data['default'] : array( $field_data['default'] );
}
}
if ( isset( $field_data['default' . $i] ) ) {
$default = $field_data['default' . $i];
if ( isset( $field_data[ 'default' . $i ] ) ) {
$default = $field_data[ 'default' . $i ];
}
if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
includes/core/class-enqueue.php
+1 -1
View File
@@ -127,7 +127,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_script( 'um_responsive', $this->js_baseurl . 'um-responsive' . $this->suffix . '.js', array( 'jquery', 'um_functions', 'um_crop' ), ultimatemember_version, true );
wp_register_script( 'um-gdpr', $this->js_baseurl . 'um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false );
wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $this->suffix . '.js', array( 'jquery', 'wp-hooks' ), ultimatemember_version, true );
wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', 'um_datetime_legacy', 'select2' ), ultimatemember_version, true );
/**
* UM hook