From 35f9aac031a231595a03928c3b37a6d5b14be0b6 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Mon, 8 May 2023 19:50:01 +0300
Subject: [PATCH] - not show account and profile on profile and account pages

---
 includes/core/class-account.php    | 16 ++++++++--------
 includes/core/class-blocks.php     | 13 +++++++++++--
 includes/core/class-fields.php     |  2 +-
 includes/core/class-shortcodes.php |  4 ----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/includes/core/class-account.php b/includes/core/class-account.php
index 29d6abf5..446a5cb2 100644
--- a/includes/core/class-account.php
+++ b/includes/core/class-account.php
@@ -626,8 +626,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 					$this->init_displayed_fields( $fields, $id );
 
 					foreach ( $fields as $key => $data ) {
-						if ( isset( $shortcode_args['widget'] ) && 1 === (int) $shortcode_args['widget'] ) {
-							$data['widget'] = 1;
+						if ( isset( $shortcode_args['is_block'] ) && 1 === (int) $shortcode_args['is_block'] ) {
+							$data['is_block'] = 1;
 						}
 						$output .= UM()->fields()->edit_field( $key, $data );
 					}
@@ -669,8 +669,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 					$this->init_displayed_fields( $fields, $id );
 
 					foreach ( $fields as $key => $data ) {
-						if ( isset( $shortcode_args['widget'] ) && 1 === (int) $shortcode_args['widget'] ) {
-							$data['widget'] = 1;
+						if ( isset( $shortcode_args['is_block'] ) && 1 === (int) $shortcode_args['is_block'] ) {
+							$data['is_block'] = 1;
 						}
 						$output .= UM()->fields()->edit_field( $key, $data );
 					}
@@ -726,8 +726,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 					$this->init_displayed_fields( $fields, $id );
 
 					foreach ( $fields as $key => $data ) {
-						if ( isset( $shortcode_args['widget'] ) && 1 === (int) $shortcode_args['widget'] ) {
-							$data['widget'] = 1;
+						if ( isset( $shortcode_args['is_block'] ) && 1 === (int) $shortcode_args['is_block'] ) {
+							$data['is_block'] = 1;
 						}
 						$output .= UM()->fields()->edit_field( $key, $data );
 					}
@@ -767,8 +767,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 					$this->init_displayed_fields( $fields, $id );
 
 					foreach ( $fields as $key => $data ) {
-						if ( isset( $shortcode_args['widget'] ) && 1 === (int) $shortcode_args['widget'] ) {
-							$data['widget'] = 1;
+						if ( isset( $shortcode_args['is_block'] ) && 1 === (int) $shortcode_args['is_block'] ) {
+							$data['is_block'] = 1;
 						}
 						$output .= UM()->fields()->edit_field( $key, $data );
 					}
diff --git a/includes/core/class-blocks.php b/includes/core/class-blocks.php
index 2720f033..3bbe6048 100644
--- a/includes/core/class-blocks.php
+++ b/includes/core/class-blocks.php
@@ -119,7 +119,13 @@ if ( ! class_exists( 'um\core\Blocks' ) ) {
 
 
 		public function um_forms_render( $atts ) {
-			$shortcode = '[ultimatemember widget="1"';
+			if ( isset( $atts['form_id'] ) && '' !== $atts['form_id'] ) {
+				$mode = get_post_meta( $atts['form_id'], '_um_mode', true );
+				if ( 'profile' === $mode && ( um_is_core_page( 'account' ) || um_is_core_page( 'user' ) ) ) {
+					return '';
+				}
+			}
+			$shortcode = '[ultimatemember';
 
 			if ( isset( $atts['form_id'] ) && '' !== $atts['form_id'] ) {
 				$shortcode .= ' form_id="' . $atts['form_id'] . '"';
@@ -139,7 +145,10 @@ if ( ! class_exists( 'um\core\Blocks' ) ) {
 
 
 		public function um_account_render( $atts ) {
-			$shortcode = '[ultimatemember_account widget="1"';
+			if ( um_is_core_page( 'account' ) || um_is_core_page( 'user' ) ) {
+				return '';
+			}
+			$shortcode = '[ultimatemember_account is_block="1"';
 
 			if ( isset( $atts['tab'] ) && 'all' !== $atts['tab'] ) {
 				$shortcode .= ' tab="' . $atts['tab'] . '"';
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 64bbd8e2..d88721b9 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2076,7 +2076,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		public function edit_field( $key, $data, $rule = false, $args = array() ) {
 			global $_um_profile_id;
 
-			if ( isset( $data['widget'] ) && 1 === (int) $data['widget'] ) {
+			if ( isset( $data['is_block'] ) && 1 === (int) $data['is_block'] ) {
 				$_um_profile_id = get_current_user_id();
 				$form_suffix    = '';
 			} else {
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index cbf6983e..5cb06727 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -691,10 +691,6 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				}
 			}
 
-			if ( ! is_user_logged_in() && isset( $args['widget'] ) && 1 === (int) $args['widget'] && 'profile' === $mode ) {
-				return;
-			}
-
 			// for profiles only
 			if ( $mode == 'profile' && um_profile_id() ) {