From e280828ac5b1ff09a700934aabf5ae86f39d49b1 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Fri, 3 Aug 2018 16:47:05 +0300
Subject: [PATCH] - fixed upgrade; - fixed conditional logic;

---
 assets/css/um-styles.css                                 | 4 ++--
 includes/admin/core/packages/2.0.22-alpha1/functions.php | 6 +++++-
 includes/admin/core/packages/2.0.22-alpha1/init.php      | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css
index 1c1053a0..dbf80c01 100644
--- a/assets/css/um-styles.css
+++ b/assets/css/um-styles.css
@@ -295,9 +295,9 @@ p.um-notice.warning {
 	padding-top: 0 !important;
 }
 
-.um-field.um-is-conditional {
+/*.um-field.um-is-conditional {
 	display: none;
-}
+}*/
 
 .um-field-label {
 	display: block;
diff --git a/includes/admin/core/packages/2.0.22-alpha1/functions.php b/includes/admin/core/packages/2.0.22-alpha1/functions.php
index aa41e5c7..f58bf904 100644
--- a/includes/admin/core/packages/2.0.22-alpha1/functions.php
+++ b/includes/admin/core/packages/2.0.22-alpha1/functions.php
@@ -11,7 +11,7 @@ function um_upgrade_get_users2022() {
 function um_upgrade_usermeta2022() {
 	um_maybe_unset_time_limit();
 
-	if ( ! empty( $_POST['page'] ) ) {
+	if ( ! empty( $_POST['page'] ) && ! empty( $_POST['pages'] ) ) {
 		$users_per_page = 50;
 
 		$from = ( $_POST['page'] * $users_per_page ) - $users_per_page + 1;
@@ -100,6 +100,10 @@ function um_upgrade_usermeta2022() {
 			}
 		}
 
+		if ( $_POST['page'] == $_POST['pages'] ) {
+			update_option( 'um_last_version_upgrade', '2.0.22-alpha1' );
+		}
+
 		wp_send_json_success( array( 'message' => sprintf( __( 'Users from %s to %s was upgraded successfully...', 'ultimate-member' ), $from, $to ) ) );
 	} else {
 		wp_send_json_error();
diff --git a/includes/admin/core/packages/2.0.22-alpha1/init.php b/includes/admin/core/packages/2.0.22-alpha1/init.php
index edc8d69a..8dbc0e73 100644
--- a/includes/admin/core/packages/2.0.22-alpha1/init.php
+++ b/includes/admin/core/packages/2.0.22-alpha1/init.php
@@ -43,7 +43,8 @@
 					dataType: 'json',
 					data: {
 						action: 'um_usermeta2022',
-						page: current_page
+						page: current_page,
+						pages: users
 					},
 					success: function( response ) {
 						if ( typeof response.data != 'undefined' ) {