From 012fab319aa07b132af4a86d0409486bb9eb689e Mon Sep 17 00:00:00 2001 From: champsupertramp Date: Tue, 6 Sep 2016 14:02:18 +0800 Subject: [PATCH] Fix role review message on registeration process --- core/um-actions-register.php | 1 + core/um-filters-arguments.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/um-actions-register.php b/core/um-actions-register.php index 0db32c02..d5e796db 100644 --- a/core/um-actions-register.php +++ b/core/um-actions-register.php @@ -222,6 +222,7 @@ $url = $ultimatemember->permalinks->get_current_url(); $url = add_query_arg( 'message', esc_attr( $status ), $url ); $url = add_query_arg( 'uid', esc_attr( um_user('ID') ), $url ); + $url = add_query_arg( 'um_form_id', esc_attr( $form_id ), $url ); exit( wp_redirect( $url ) ); } diff --git a/core/um-filters-arguments.php b/core/um-filters-arguments.php index 8dfe8c15..205204f3 100644 --- a/core/um-filters-arguments.php +++ b/core/um-filters-arguments.php @@ -31,7 +31,14 @@ if ($ultimatemember->shortcodes->message_mode == true) { $args['template'] = 'message'; um_fetch_user( $_REQUEST['uid'] ); - $ultimatemember->shortcodes->custom_message = um_user( um_user('status') . '_message' ); + + $message = get_post_meta( $_REQUEST['um_form_id'], "_um_pending_message", true ); + + if( empty( $message ) ){ + $message = um_user( um_user('status') . '_message' ); + } + + $ultimatemember->shortcodes->custom_message = $message; um_reset_user(); }