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

- fixed slider filter preloader;

Browse Source 
- fixed redirect_to and approve user status on registration;
This commit is contained in:
nikitasinelnikov
2020-08-31 23:08:54 +03:00
parent c112f02743
commit 78d8a2c845
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-members.js
+3
View File
@@ -1374,6 +1374,9 @@ jQuery(document.body).ready( function() {
}, },
stop: function( event, ui ) { stop: function( event, ui ) {
if ( ! um_is_directory_busy( directory ) ) { if ( ! um_is_directory_busy( directory ) ) {
um_members_show_preloader( directory );
um_set_url_from_data( directory, 'filter_' + filter_name + '_from', ui.values[0] ); um_set_url_from_data( directory, 'filter_' + filter_name + '_from', ui.values[0] );
um_set_url_from_data( directory, 'filter_' + filter_name + '_to', ui.values[1] ); um_set_url_from_data( directory, 'filter_' + filter_name + '_to', ui.values[1] );
assets/js/um-members.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
includes/core/um-actions-register.php
+6 -8
View File
@@ -175,11 +175,6 @@ function um_check_user_status( $user_id, $args ) {
do_action( "track_{$status}_user_registration" ); do_action( "track_{$status}_user_registration" );
// Priority redirect
if ( isset( $args['redirect_to'] ) ) {
exit( wp_safe_redirect( urldecode( $args['redirect_to'] ) ) );
}
if ( $status == 'approved' ) { if ( $status == 'approved' ) {
UM()->user()->auto_login( $user_id ); UM()->user()->auto_login( $user_id );
@@ -206,6 +201,11 @@ function um_check_user_status( $user_id, $args ) {
*/ */
do_action( 'um_registration_after_auto_login', $user_id ); do_action( 'um_registration_after_auto_login', $user_id );
// Priority redirect
if ( isset( $args['redirect_to'] ) ) {
exit( wp_safe_redirect( urldecode( $args['redirect_to'] ) ) );
}
if ( um_user( 'auto_approve_act' ) == 'redirect_url' && um_user( 'auto_approve_url' ) !== '' ) { if ( um_user( 'auto_approve_act' ) == 'redirect_url' && um_user( 'auto_approve_url' ) !== '' ) {
exit( wp_redirect( um_user( 'auto_approve_url' ) ) ); exit( wp_redirect( um_user( 'auto_approve_url' ) ) );
} }
@@ -214,9 +214,7 @@ function um_check_user_status( $user_id, $args ) {
exit( wp_redirect( um_user_profile_url() ) ); exit( wp_redirect( um_user_profile_url() ) );
} }
} } else {
if ( $status != 'approved' ) {
if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) { if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) {
/** /**