10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

Browse Source 
# Conflicts:
#	assets/js/um-conditional.js
#	assets/js/um-conditional.min.js
#	assets/js/um-scripts.min.js
#	includes/core/class-enqueue.php
This commit is contained in:
Yurii Nalivaiko
2018-11-13 14:57:01 +02:00
parent 289a3a05d1 0d1a9f676b
commit 10d699333c
17 changed files with 788 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-forms.js
+18 -11
View File
@@ -123,10 +123,13 @@ jQuery(document).ready( function() {
button.siblings('.um-media-upload-data-width').val(attachment.width);
button.siblings('.um-media-upload-data-height').val(attachment.height);
button.siblings('.um-media-upload-data-thumbnail').val(attachment.thumbnail);
button.siblings('.um-media-upload-data-url').trigger('change');
button.siblings('.um-media-upload-url').val(attachment.url);
button.siblings('.um-clear-image').show();
button.hide();
jQuery( document ).trigger( 'um_media_upload_select', [button, attachment] );
});
frame.open();
@@ -137,16 +140,20 @@ jQuery(document).ready( function() {
});
jQuery('.um-clear-image').click( function(e) {
var default_image_url = jQuery(this).siblings('.um-forms-field').data('default');
jQuery(this).siblings('.um-set-image').show();
jQuery(this).hide();
jQuery(this).siblings('.icon_preview').attr( 'src', default_image_url );
jQuery(this).siblings('.um-media-upload-data-id').val('');
jQuery(this).siblings('.um-media-upload-data-width').val('');
jQuery(this).siblings('.um-media-upload-data-height').val('');
jQuery(this).siblings('.um-media-upload-data-thumbnail').val('');
jQuery(this).siblings('.um-forms-field').val( default_image_url );
jQuery(this).siblings('.um-media-upload-url').val( default_image_url );
var clear_button = jQuery(this);
var default_image_url = clear_button.siblings('.um-forms-field').data('default');
clear_button.siblings('.um-set-image').show();
clear_button.hide();
clear_button.siblings('.icon_preview').attr( 'src', default_image_url );
clear_button.siblings('.um-media-upload-data-id').val('');
clear_button.siblings('.um-media-upload-data-width').val('');
clear_button.siblings('.um-media-upload-data-height').val('');
clear_button.siblings('.um-media-upload-data-thumbnail').val('');
clear_button.siblings('.um-forms-field').val( default_image_url );
clear_button.siblings('.um-media-upload-data-url').trigger('change');
clear_button.siblings('.um-media-upload-url').val( default_image_url );
jQuery( document ).trigger( 'um_media_upload_clear', clear_button );
});
}
@@ -154,7 +161,7 @@ jQuery(document).ready( function() {
/**
* On option fields change
*/
jQuery('body').on('change', '.um-forms-field', function() {
jQuery( document.body ).on('change', '.um-forms-field', function() {
if ( jQuery('.um-forms-line[data-conditional*=\'"' + jQuery(this).data('field_id') + '",\']').length > 0 ) {
run_check_conditions();
}
includes/admin/core/class-admin-forms.php
+1 -1
View File
@@ -975,7 +975,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
$class_attr = ' class="um-forms-field um-media-upload-data-url ' . $class . '"';
$data = array(
'field_id' => $field_data['id'],
'field_id' => $field_data['id'] . '_url',
);
if ( ! empty( $field_data['default']['url'] ) )
includes/admin/core/class-admin-settings.php
+1 -1
View File
@@ -1170,7 +1170,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
*/
do_action( "um_settings_page_before_" . $current_tab . "_" . $current_subtab . "_content" );
if ( in_array( $current_tab, apply_filters('um_settings_custom_tabs', array( 'licenses', 'install_info' ) ) ) || in_array( $current_subtab, apply_filters('um_settings_custom_subtabs', array() ) ) ) {
if ( in_array( $current_tab, apply_filters('um_settings_custom_tabs', array( 'licenses', 'install_info' ) ) ) || in_array( $current_subtab, apply_filters( 'um_settings_custom_subtabs', array(), $current_tab ) ) ) {
/**
* UM hook
includes/core/class-ajax-common.php
+1
View File
@@ -39,6 +39,7 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) {
add_action( 'wp_ajax_um_ajax_paginate', array( UM()->query(), 'ajax_paginate' ) );
add_action( 'wp_ajax_um_ajax_paginate_posts', array( UM()->user_posts(), 'load_posts' ) );
add_action( 'wp_ajax_nopriv_um_ajax_paginate_posts', array( UM()->user_posts(), 'load_posts' ) );
add_action( 'wp_ajax_um_muted_action', array( UM()->form(), 'ajax_muted_action' ) );
includes/core/class-date-time.php
+18 -20
View File
@@ -36,10 +36,10 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
/**
* Show a cool time difference between 2 timestamps
*
* @param $from
* @param string $to
* @param int $from
* @param int $to
*
* @return mixed|void
* @return string
*/
function time_diff( $from, $to = '' ) {
$since = '';
@@ -51,52 +51,50 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
$diff = (int) abs( $to - $from );
if ( $diff < 60 ) {
$since = __('just now','ultimate-member');
$since = __( 'just now', 'ultimate-member' );
} elseif ( $diff < HOUR_IN_SECONDS ) {
$mins = round( $diff / MINUTE_IN_SECONDS );
if ( $mins <= 1 )
if ( $mins <= 1 ) {
$mins = 1;
if ( $mins == 1 ) {
$since = sprintf( __('%s min','ultimate-member'), $mins );
} else {
$since = sprintf( __('%s mins','ultimate-member'), $mins );
}
$since = sprintf( _n( '%s min', '%s mins', $mins, 'ultimate-member' ), $mins );
} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
$hours = round( $diff / HOUR_IN_SECONDS );
if ( $hours <= 1 )
if ( $hours <= 1 ) {
$hours = 1;
if ( $hours == 1 ) {
$since = sprintf( __('%s hr','ultimate-member'), $hours );
} else {
$since = sprintf( __('%s hrs','ultimate-member'), $hours );
}
$since = sprintf( _n( '%s hr', '%s hrs', $hours, 'ultimate-member' ), $hours );
} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
$days = round( $diff / DAY_IN_SECONDS );
if ( $days <= 1 )
if ( $days <= 1 ) {
$days = 1;
}
if ( $days == 1 ) {
$since = sprintf( __('Yesterday at %s','ultimate-member'), date('g:ia', $from ) );
$since = sprintf( __( 'Yesterday at %s', 'ultimate-member' ), date_i18n( 'g:ia', $from ) );
} else {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
}
} elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
} elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s','ultimate-member'), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
} elseif ( $diff >= YEAR_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date( 'F d, Y', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d, Y', $from ), date_i18n( 'g:ia', $from ) );
}
includes/core/class-enqueue.php
+100 -155
View File
@@ -1,9 +1,11 @@
<?php
namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'um\core\Enqueue' ) ) {
@@ -67,10 +69,9 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
/**
* Enqueue scripts and styles
*
*/
function wp_enqueue_scripts() {
function register_scripts() {
$dequeue_select2 = apply_filters( 'um_dequeue_select2_scripts', false );
if ( class_exists( 'WooCommerce' ) || $dequeue_select2 ) {
wp_dequeue_style( 'select2' );
@@ -81,7 +82,6 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
}
wp_register_script( 'select2', $this->js_baseurl . 'select2/select2.full.min.js', array( 'jquery', 'jquery-masonry' ), ultimatemember_version, true );
wp_register_script( 'um_scrollbar', $this->js_baseurl . 'um-scrollbar' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_jquery_form', $this->js_baseurl . 'um-jquery-form' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
@@ -96,16 +96,56 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
$datetime_deps[] = 'um_datetime_locale';
}
wp_register_script( 'um_datetime', $this->js_baseurl . 'pickadate/picker.js', $datetime_deps, ultimatemember_version, true );
wp_register_script( 'um_datetime_date', $this->js_baseurl . 'pickadate/picker.date.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_datetime_time', $this->js_baseurl . 'pickadate/picker.time.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_datetime_legacy', $this->js_baseurl . 'pickadate/legacy.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_datetime_date', $this->js_baseurl . 'pickadate/picker.date.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true );
wp_register_script( 'um_datetime_time', $this->js_baseurl . 'pickadate/picker.time.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true );
wp_register_script( 'um_datetime_legacy', $this->js_baseurl . 'pickadate/legacy.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true );
wp_register_script( 'um_tipsy', $this->js_baseurl . 'um-tipsy' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_raty', $this->js_baseurl . 'um-raty' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_crop', $this->js_baseurl . 'um-crop' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_modal', $this->js_baseurl . 'um-modal' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_crop' ), ultimatemember_version, true );
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_functions', $this->js_baseurl . 'um-functions' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util', 'um_scrollbar' ), 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_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional' ), ultimatemember_version, true );
/**
* UM hook
*
* @type filter
* @title um_enqueue_localize_data
* @description Extend UM localized data
* @input_vars
* [{"var":"$data","type":"array","desc":"Localize Array"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_enqueue_localize_data', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_enqueue_localize_data', 'my_enqueue_localize_data', 10, 1 );
* function my_enqueue_localize_data( $data ) {
* // your code here
* return $data;
* }
* ?>
*/
$localize_data = apply_filters( 'um_enqueue_localize_data', array() );
wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $this->suffix . '.js', array( 'jquery', 'wp-util' ), ultimatemember_version, true );
wp_register_script('um_account', $this->js_baseurl . 'um-account' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_gchart', 'https://www.google.com/jsapi', array(), ultimatemember_version, true );
}
/**
*
*/
function register_styles() {
//FontAwesome and FontIcons styles
wp_register_style( 'um_fonticons_ii', $this->css_baseurl . 'um-fonticons-ii.css', array(), ultimatemember_version );
wp_register_style( 'um_fonticons_fa', $this->css_baseurl . 'um-fonticons-fa.css', array(), ultimatemember_version );
@@ -115,70 +155,45 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), ultimatemember_version );
wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime', $this->css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um-datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um-datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );
wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), ultimatemember_version );
wp_register_style( 'um_scrollbar', $this->css_baseurl . 'um-scrollbar.css', array(), ultimatemember_version );
//ui slider for filters
//wp_enqueue_script( 'jquery-ui-slider' );
wp_register_style( 'um_rtl', $this->css_baseurl . 'um.rtl.css', array(), ultimatemember_version );
wp_register_style( 'um_default_css', $this->css_baseurl . 'um-old-default.css', array(), ultimatemember_version );
wp_register_style( 'um_modal', $this->css_baseurl . 'um-modal.css', array( 'um_crop' ), ultimatemember_version );
wp_register_style( 'um_responsive', $this->css_baseurl . 'um-responsive.css', array( 'um_profile', 'um_crop' ), ultimatemember_version );
wp_register_style( 'um_styles', $this->css_baseurl . 'um-styles.css', array(), ultimatemember_version );
wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array(), ultimatemember_version );
wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array(), ultimatemember_version );
wp_register_style( 'um_account', $this->css_baseurl . 'um-account.css', array(), ultimatemember_version );
wp_register_style( 'um_misc', $this->css_baseurl . 'um-misc.css', array(), ultimatemember_version );
}
global $post;
/**
* Enqueue scripts and styles
*/
function wp_enqueue_scripts() {
if ( ! is_admin() ) {
$c_url = UM()->permalinks()->get_current_url( get_option( 'permalink_structure' ) );
$exclude = UM()->options()->get( 'js_css_exclude' );
if ( is_array( $exclude ) ) {
array_filter( $exclude );
}
if ( $exclude && is_array( $exclude ) ) {
foreach ( $exclude as $match ) {
$sub_match = untrailingslashit( $match );
if ( ! empty( $c_url ) && ! empty( $sub_match ) && strstr( $c_url, $sub_match ) ) {
return;
}
}
}
$include = UM()->options()->get( 'js_css_include' );
if ( is_array( $include ) ) {
array_filter( $include );
}
if ( $include && is_array( $include ) ) {
foreach ( $include as $match ) {
$sub_match = untrailingslashit( $match );
if ( ! empty( $c_url ) && ! empty( $sub_match ) && strstr( $c_url, $sub_match ) ) {
$force_load = true;
} else {
if ( ! isset( $force_load ) ) {
$force_load = false;
}
}
}
}
}
if ( isset( $force_load ) && $force_load == false ) {
return;
}
$this->register_scripts();
$this->register_styles();
$this->load_original();
// rtl style
if ( is_rtl() ) {
wp_register_style('um_rtl', um_url . 'assets/css/um.rtl.css', array(), ultimatemember_version );
wp_enqueue_style('um_rtl');
wp_enqueue_style( 'um_rtl' );
}
if(is_object($post) && has_shortcode($post->post_content,'ultimate-member')) {
wp_dequeue_script('jquery-form');
global $post;
if ( is_object( $post ) && has_shortcode( $post->post_content,'ultimatemember' ) ) {
wp_dequeue_script( 'jquery-form' );
}
//old settings before UM 2.0 CSS
wp_register_style('um_default_css', um_url . 'assets/css/um-old-default.css', array(), ultimatemember_version );
wp_enqueue_style('um_default_css');
wp_enqueue_style( 'um_default_css' );
$this->old_css_settings();
}
@@ -191,11 +206,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
$uploads = wp_upload_dir();
$upload_dir = $uploads['basedir'] . DIRECTORY_SEPARATOR . 'ultimatemember' . DIRECTORY_SEPARATOR;
if ( file_exists( $upload_dir . 'um_old_settings.css' ) ) {
//was the issues with HTTPS
//wp_register_style('um_old_css', $uploads['baseurl'] . '/ultimatemember/um_old_settings.css' );
//fixed using "../../"
wp_register_style('um_old_css', um_url . '../../uploads/ultimatemember/um_old_settings.css' );
wp_enqueue_style('um_old_css');
wp_register_style( 'um_old_css', um_url . '../../uploads/ultimatemember/um_old_settings.css' );
wp_enqueue_style( 'um_old_css' );
}
}
@@ -243,10 +255,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Include Google charts
*/
function load_google_charts() {
wp_register_script('um_gchart', 'https://www.google.com/jsapi' );
wp_enqueue_script('um_gchart');
wp_enqueue_script( 'um_gchart' );
}
@@ -254,22 +263,11 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load plugin css
*/
function load_css() {
wp_register_style('um_styles', um_url . 'assets/css/um-styles.css' );
wp_enqueue_style('um_styles');
wp_register_style('um_members', um_url . 'assets/css/um-members.css' );
wp_enqueue_style('um_members');
wp_register_style('um_profile', um_url . 'assets/css/um-profile.css' );
wp_enqueue_style('um_profile');
wp_register_style('um_account', um_url . 'assets/css/um-account.css' );
wp_enqueue_style('um_account');
wp_register_style('um_misc', um_url . 'assets/css/um-misc.css' );
wp_enqueue_style('um_misc');
wp_enqueue_style( 'um_styles' );
wp_enqueue_style( 'um_members' );
wp_enqueue_style( 'um_profile' );
wp_enqueue_style( 'um_account' );
wp_enqueue_style( 'um_misc' );
}
@@ -277,19 +275,17 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load select-dropdowns JS
*/
function load_selectjs() {
wp_enqueue_script('select2');
wp_enqueue_style('select2');
wp_enqueue_script( 'select2' );
wp_enqueue_style( 'select2' );
}
/**
* Load Fonticons
*/
function load_fonticons(){
wp_enqueue_style('um_fonticons_ii');
wp_enqueue_style('um_fonticons_fa');
function load_fonticons() {
wp_enqueue_style( 'um_fonticons_ii' );
wp_enqueue_style( 'um_fonticons_fa' );
}
@@ -297,9 +293,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load fileupload JS
*/
function load_fileupload() {
wp_enqueue_script('um_jquery_form');
wp_enqueue_script('um_fileupload');
wp_enqueue_style('um_fileupload');
wp_enqueue_script( 'um_fileupload' );
wp_enqueue_style( 'um_fileupload' );
}
@@ -307,12 +302,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load JS functions
*/
function load_functions() {
wp_register_script('um_functions', um_url . 'assets/js/um-functions' . $this->suffix . '.js', array('jquery', 'jquery-masonry', 'wp-util', 'um_scrollbar') );
wp_enqueue_script('um_functions');
wp_enqueue_script( 'um-gdpr', um_url . 'assets/js/um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false );
wp_enqueue_script('um_functions' );
wp_enqueue_script( 'um-gdpr' );
}
@@ -320,47 +311,11 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load custom JS
*/
function load_customjs() {
wp_register_script('um_conditional', um_url . 'assets/js/um-conditional' . $this->suffix . '.js' );
wp_enqueue_script('um_conditional');
wp_register_script('um_scripts', um_url . 'assets/js/um-scripts' . $this->suffix . '.js', array('jquery','wp-util') );
/**
* UM hook
*
* @type filter
* @title um_enqueue_localize_data
* @description Extend UM localized data
* @input_vars
* [{"var":"$data","type":"array","desc":"Localize Array"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_enqueue_localize_data', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_enqueue_localize_data', 'my_enqueue_localize_data', 10, 1 );
* function my_enqueue_localize_data( $data ) {
* // your code here
* return $data;
* }
* ?>
*/
$localize_data = apply_filters( 'um_enqueue_localize_data', array() );
wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
wp_enqueue_script('um_scripts');
wp_register_script('um_members', um_url . 'assets/js/um-members' . $this->suffix . '.js' );
wp_enqueue_script('um_members');
wp_register_script('um_profile', um_url . 'assets/js/um-profile' . $this->suffix . '.js', array('jquery','wp-util') );
wp_enqueue_script('um_profile');
wp_register_script('um_account', um_url . 'assets/js/um-account' . $this->suffix . '.js' );
wp_enqueue_script('um_account');
}
@@ -398,32 +353,27 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
/**
* Load crop script
*/
function load_imagecrop(){
wp_enqueue_script('um_crop');
wp_enqueue_style('um_crop');
function load_imagecrop() {
wp_enqueue_script( 'um_crop' );
wp_enqueue_style( 'um_crop' );
}
/**
* Load tipsy
*/
function load_tipsy(){
wp_enqueue_script('um_tipsy');
wp_enqueue_style('um_tipsy');
function load_tipsy() {
wp_enqueue_script( 'um_tipsy' );
wp_enqueue_style( 'um_tipsy' );
}
/**
* Load modal
*/
function load_modal(){
wp_register_style('um_modal', um_url . 'assets/css/um-modal.css' );
wp_enqueue_style('um_modal');
wp_register_script('um_modal', um_url . 'assets/js/um-modal' . $this->suffix . '.js', array('jquery','wp-util') );
wp_enqueue_script('um_modal');
function load_modal() {
wp_enqueue_script( 'um_modal' );
wp_enqueue_style( 'um_modal' );
}
@@ -431,13 +381,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
* Load responsive styles
*/
function load_responsive() {
wp_register_script( 'um_responsive', um_url . 'assets/js/um-responsive' . $this->suffix . '.js', array( 'um_crop' ), ultimatemember_version, true );
wp_enqueue_script( 'um_responsive' );
wp_register_style('um_responsive', um_url . 'assets/css/um-responsive.css', array( 'um_profile' ) );
wp_enqueue_style('um_responsive');
wp_enqueue_style( 'um_responsive' );
}
}
includes/core/class-roles-capabilities.php
+5 -2
View File
@@ -530,8 +530,11 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
$temp = array();
foreach ( $role_data as $key=>$value ) {
if ( strpos( $key, '_um_' ) === 0 )
$key = str_replace( '_um_', '', $key );
if ( strpos( $key, '_um_' ) === 0 ) {
$key = preg_replace('/_um_/', '', $key, 1);
}
//$key = str_replace( '_um_', '', $key, $count );
$temp[ $key ] = $value;
}
includes/core/um-filters-fields.php
+2 -1
View File
@@ -129,7 +129,8 @@ add_filter( 'um_profile_field_filter_hook__user_registered', 'um_profile_field_f
* @return string
*/
function um_profile_field_filter_hook__last_login( $value, $data ) {
$value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
//$value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
$value = um_user_last_login( um_user( 'ID' ) );
return $value;
}
add_filter( 'um_profile_field_filter_hook__last_login', 'um_profile_field_filter_hook__last_login', 99, 2 );
includes/um-deprecated-functions.php
+18
View File
@@ -399,4 +399,22 @@ function um_requesting_password_change() {
}
return false;
}
/**
* Get core page url
*
* @deprecated 2.0.30
*
* @param $time1
* @param $time2
*
* @return string
*/
function um_time_diff( $time1, $time2 ) {
//um_deprecated_function( 'um_time_diff', '2.0.30', 'UM()->datetime()->time_diff' );
return UM()->datetime()->time_diff( $time1, $time2 );
}
includes/um-short-functions.php
+3 -22
View File
@@ -981,19 +981,6 @@ function um_is_temp_file( $filename ) {
}
/**
* Get core page url
*
* @param $time1
* @param $time2
*
* @return mixed|void
*/
function um_time_diff( $time1, $time2 ) {
return UM()->datetime()->time_diff( $time1, $time2 );
}
/**
* Get user's last login timestamp
*
@@ -1013,19 +1000,13 @@ function um_user_last_login_timestamp( $user_id ) {
/**
* Get user's last login (time diff)
*
* @param $user_id
* @param int $user_id
*
* @return mixed|string|void
* @return string
*/
function um_user_last_login( $user_id ) {
$value = get_user_meta( $user_id, '_um_last_login', true );
if ( $value ) {
$value = um_time_diff( $value, current_time( 'timestamp' ) );
} else {
$value = '';
}
return $value;
return ! empty( $value ) ? UM()->datetime()->time_diff( $value, current_time( 'timestamp' ) ) : '';
}