From 970252f8a9b1dee4d9d2f309eb06df7c73ba0bb4 Mon Sep 17 00:00:00 2001
From: meteor <meteor@ecwid.com>
Date: Wed, 16 Oct 2024 09:39:24 +0400
Subject: [PATCH 1/2] PLUGINS-6944 fix for playground detecting

---
 ecwid-shopping-cart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecwid-shopping-cart.php b/ecwid-shopping-cart.php
index 4680bf4b..524608bf 100644
--- a/ecwid-shopping-cart.php
+++ b/ecwid-shopping-cart.php
@@ -1642,7 +1642,7 @@ function ecwid_plugin_activation_redirect( $plugin ) {
 
 	$is_newbie = ecwid_is_demo_store();
 
-    if( !$is_cli_running && $is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
+    if( !$is_cli_running && !$is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
         wp_safe_redirect( Ecwid_Admin::get_dashboard_url() );
         exit();
     }

From 9ae7ba44f0e5af335b9050c290690281b1be3692 Mon Sep 17 00:00:00 2001
From: meteor <meteor@ecwid.com>
Date: Wed, 16 Oct 2024 13:55:44 +0400
Subject: [PATCH 2/2] PLUGINS-6807

---
 includes/class-ecwid-admin-main-page.php |  2 +-
 templates/debug.php                      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/includes/class-ecwid-admin-main-page.php b/includes/class-ecwid-admin-main-page.php
index 915e6b12..e43c572a 100644
--- a/includes/class-ecwid-admin-main-page.php
+++ b/includes/class-ecwid-admin-main-page.php
@@ -146,7 +146,7 @@ public function _do_integrated_admin_page( $page = self::PAGE_HASH_DASHBOARD ) {
 			$result  = $request->do_request( array( 'timeout' => 20 ) );
 		}//end if
 
-		if ( $result['code'] == 403 ) {
+		if ( ! empty( $result ) && $result['code'] == 403 ) {
 			Ecwid_Api_V3::save_token( '' );
 		}
 
diff --git a/templates/debug.php b/templates/debug.php
index 38933cbb..afb2aa0a 100644
--- a/templates/debug.php
+++ b/templates/debug.php
@@ -78,6 +78,22 @@
 		<div>Theme identification</div>
 		<div><?php echo esc_html( ecwid_get_theme_identification() ); ?></div>
 	</div>
+	<div class="section">
+		<div>Config URLs matching</div>
+		<div>
+		<p>
+		<?php
+		if ( defined( 'WP_SITEURL' ) ) {
+			echo esc_html( sprintf( 'WP_SITEURL: %s', WP_SITEURL ) );
+		} else {
+			echo 'WP_SITEURL isn\'t defined';
+		}
+		?>
+		</p>
+		<p><?php echo esc_html( sprintf( "Option 'siteurl': %s", get_option( 'siteurl' ) ) ); ?></p>
+		<p><?php echo esc_html( sprintf( 'admin_url(): %s', admin_url() ) ); ?></p>
+		</div>
+	</div>
 	<div class="section">
 		<div>Affiliate Ref ID</div>
 		<div><?php echo esc_html( apply_filters( 'ecwid_get_new_store_ref_id', '' ) ); ?></div>