From ffd9668319a2f391fd2b783bd46ad740d5477a07 Mon Sep 17 00:00:00 2001
From: ultimatemember <umplugin@gmail.com>
Date: Fri, 13 Feb 2015 15:26:36 +0200
Subject: [PATCH] Version 1.0.52

---
 admin/assets/css/um-admin-modal.css   | 17 +++++++++++++++++
 admin/core/um-admin-actions-modal.php |  4 +---
 admin/core/um-admin-users.php         | 10 +++++-----
 core/um-short-functions.php           | 17 ++++++++++++++---
 index.php                             |  2 +-
 readme.txt                            |  7 ++++++-
 um-config.php                         |  2 +-
 7 files changed, 45 insertions(+), 14 deletions(-)

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 .= '<div class="um-admin-infobox">';
+		
 		if ( isset( $data ) && is_array( $data ) ) {
 			foreach( $data as $k => $v ) {
 				
@@ -113,12 +116,20 @@ function um_user_ip() {
 						$v = implode(',', $v );
 					}
 					
-					$output .= "$k: $v" . "\r\n";
-				
+					if ( $style ) {
+						if ( !$v ) $v = __('(empty)','ultimatemember');
+						$output .= "<p><label>$k</label><span>$v</span></p>";
+					} else {
+						$output .= "$k: $v" . "\r\n";
+					}
+					
 				}
 				
 			}
 		}
+		
+		if ( $style ) $output .= '</div>';
+		
 		return $output;
 	}
 	
diff --git a/index.php b/index.php
index d516fea4..aa86ee36 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress
-Version: 1.0.51
+Version: 1.0.52
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 */
diff --git a/readme.txt b/readme.txt
index 3ff754d6..df9f39b8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -7,7 +7,7 @@ Tags: access control, author, authors, author profile, comments, community, comm
 Requires at least: 4.1
 Tested up to: 4.1
 
-Stable Tag: 1.0.51
+Stable Tag: 1.0.52
 
 License: GNU Version 2 or Any Later Version
 
@@ -186,6 +186,11 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
 
 == Changelog ==
 
+= 1.0.52: February 13, 2015 =
+
+* Fixed: issue with users backend **update recommended**
+* Fixed: preview registration info in users backend
+
 = 1.0.51: February 13, 2015 =
 
 * New: show registration info for each user in users backend
diff --git a/um-config.php b/um-config.php
index 4ee1ce38..ac9ef749 100644
--- a/um-config.php
+++ b/um-config.php
@@ -1696,7 +1696,7 @@ $this->sections[] = array(
         array(
                 'id'       		=> 'js_css_exlcude_home',
                 'type'     		=> 'switch',
-                'title'   		=> __( 'Never load plugin JS and CSS on homepage?','ultimatemember' ),
+                'title'   		=> __( 'Never load plugin JS and CSS on homepage','ultimatemember' ),
 				'default' 		=> 0,
 				'desc' 	   		=> __('This can disable loading plugin js and css files on home page.','ultimatemember'),
 				'on'			=> __('On','ultimatemember'),