Merge pull request #301 from Ecwid/dev

Dev
Ecwid · Oct 16, 2024 · 2a96957 · 2a96957
2 parents e31b843 + 9ae7ba4
commit 2a96957
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git 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();
     }

diff --git 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
@@ -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>