diff --git a/admin/assets/css/um-admin-modal.css b/admin/assets/css/um-admin-modal.css index df85b6f2..93dfbb62 100644 --- a/admin/assets/css/um-admin-modal.css +++ b/admin/assets/css/um-admin-modal.css @@ -117,6 +117,23 @@ color: #aaa; } +.um-admin-infobox p, +.um-admin-infobox label { + color: #666; +} + +.um-admin-infobox p { + border-top: 1px solid #e5e5e5; + padding-top: 15px; +} + +.um-admin-infobox label { + font-weight: bold; + display: block; + color: #333; + cursor: default; +} + /* - Conditional fields */ diff --git a/admin/core/um-admin-actions-modal.php b/admin/core/um-admin-actions-modal.php index 39f3df89..5aa6f266 100644 --- a/admin/core/um-admin-actions-modal.php +++ b/admin/core/um-admin-actions-modal.php @@ -358,9 +358,7 @@ $submitted = um_user('submitted'); - $form_id = $submitted['form_id']; - - $output = do_shortcode('[ultimatemember form_id='.$form_id.']'); + $output = um_user_submitted_registration( true ); break; diff --git a/admin/core/um-admin-users.php b/admin/core/um-admin-users.php index aa53b408..ca85e18d 100644 --- a/admin/core/um-admin-users.php +++ b/admin/core/um-admin-users.php @@ -172,11 +172,6 @@ class UM_Admin_Users { } - // filter by user role - if ( isset($_REQUEST['um_filter_role']) ) { - exit( wp_redirect( admin_url('users.php?um_role=' . $_REQUEST['um_filter_role'] ) ) ); - } - // bulk edit users if ( isset($_REQUEST['users']) && is_array($_REQUEST['users']) && isset($_REQUEST['um_bulkedit']) && $_REQUEST['um_bulkedit'] != '' && isset($_REQUEST['um_bulk_action']) && !empty($_REQUEST['um_bulk_action']) ){ @@ -216,6 +211,11 @@ class UM_Admin_Users { } + // filter by user role + if ( isset($_REQUEST['um_filter_role']) && !$_REQUEST['new_role'] && $_REQUEST['um_filter_role'] ) { + exit( wp_redirect( admin_url('users.php?um_role=' . $_REQUEST['um_filter_role'] ) ) ); + } + } } diff --git a/core/um-short-functions.php b/core/um-short-functions.php index bac05db3..69ef3885 100644 --- a/core/um-short-functions.php +++ b/core/um-short-functions.php @@ -101,9 +101,12 @@ function um_user_ip() { /*** *** @Get submitted user information ***/ - function um_user_submitted_registration() { + function um_user_submitted_registration( $style = false ) { $output = null; $data = um_user('submitted'); + + if ( $style ) $output .= '
$v
"; + } else { + $output .= "$k: $v" . "\r\n"; + } + } } } + + if ( $style ) $output .= '