From e9ef108e426091f7dc657140598a4d81bef07971 Mon Sep 17 00:00:00 2001
From: Champ Camba <heychampsupertramp@gmail.com>
Date: Thu, 28 Nov 2019 18:01:29 +0800
Subject: [PATCH] Fix Login form preview in the Form Builder

---
 includes/core/class-fields.php     | 5 ++++-
 includes/core/class-shortcodes.php | 2 +-
 includes/core/um-actions-login.php | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 6f7da61b..2dca5cd4 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -591,6 +591,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return mixed
 		 */
 		function field_value( $key, $default = false, $data = null ) {
+
+			if( defined('DOING_AJAX') && DOING_AJAX ) return '';
+			
 			if ( isset( $_SESSION ) && isset( $_SESSION['um_social_profile'][ $key ] ) && isset( $this->set_mode ) && $this->set_mode == 'register' ) {
 				return $_SESSION['um_social_profile'][ $key ];
 			}
@@ -1925,7 +1928,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			um_fetch_user( $_um_profile_id );
 
 			// do not show passwords
-			if ( isset( UM()->user()->preview ) && UM()->user()->preview ) {
+			if ( isset( UM()->user()->preview ) && UM()->user()->preview && ! is_admin() ) {
 				if ( $data['type'] == 'password' ) {
 					return '';
 				}
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 20baa26e..baf88cdf 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -134,7 +134,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 * @return array
 		 */
 		function display_logout_form( $args ) {
-			if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' ) {
+			if ( is_user_logged_in() && isset( $args['mode'] ) && $args['mode'] == 'login' && ! is_admin() ) {
 
 				if ( get_current_user_id() != um_user( 'ID' ) ) {
 					um_fetch_user( get_current_user_id() );
diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index c5b2ff76..0dd4cc4c 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -325,7 +325,7 @@ add_action( 'um_submit_form_login', 'um_submit_form_login', 10 );
  */
 function um_add_submit_button_to_login( $args ) {
 	// DO NOT add when reviewing user's details
-	if ( UM()->user()->preview == true && is_admin() ) {
+	if ( UM()->user()->preview == true && ! is_admin() ) {
 		return;
 	}