Merge pull request #326 from Ecwid/dev

Dev
Ecwid · Feb 26, 2025 · 8d896c1 · 8d896c1
2 parents b6499c0 + b1573d2
commit 8d896c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,7 @@
 == Changelog ==
+= 6.12.30 - Feb 26, 2024 =
+- Fixed an issue where some links in the storefront could return a "not found" status in some cases.
+
 = 6.12.29 - Feb 21, 2024 =
 - Fixed an issue where incorrect data was sometimes displayed on the storefront page. Please update your ecommerce plugin.
 

diff --git a/ecwid-shopping-cart.php b/ecwid-shopping-cart.php
@@ -5,7 +5,7 @@
 Description: Ecwid by Lightspeed is a free full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
 Text Domain: ecwid-shopping-cart
 Author: Ecwid Ecommerce
-Version: 6.12.29
+Version: 6.12.30
 Author URI: https://ecwid.to/ecwid-site
 License: GPLv2 or later
 */

diff --git a/includes/class-ecwid-static-page.php b/includes/class-ecwid-static-page.php
@@ -93,8 +93,6 @@ protected static function maybe_fetch_data() {
 			$query_params['clean_urls'] = 'false';
 		}
 
-		$query_params['base_url'] = get_permalink();
-
 		if ( array_key_exists( 'offset', $_GET ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$query_params['offset'] = intval( $_GET['offset'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
@@ -145,6 +143,8 @@ protected static function maybe_fetch_data() {
 		}
 
 		if ( ! ecwid_is_demo_store() ) {
+            $query_params['baseUrl'] = get_permalink();
+
 			$query_params['getStaticContent'] = 'true';
 			$query_params['slugsWithoutIds'] = 'false';
 			$query_params['slug']             = self::get_current_storefront_page_slug();
@@ -155,6 +155,8 @@ protected static function maybe_fetch_data() {
 				$query_params['storeRootPage'] = 'false';
 			}
 		} else {
+            $query_params['base_url'] = get_permalink();
+
             if ( ! empty( $query_params['default_category_id'] ) ) {
                 $endpoint_params = array(
                     'mode' => 'category',
@@ -259,7 +261,7 @@ protected static function get_static_snapshot( $endpoint_params, $query_params,
 			if ( ! empty( $static_content->htmlCode ) ) {
 				$pattern = '/<img(.*?)>/is';
 
-				$static_content->htmlCode = preg_replace( $pattern, '<img $1 decoding="async" loading="lazy">', $static_content->htmlCode );
+				$static_content->htmlCode = preg_replace( $pattern, '<img $1 decoding="async">', $static_content->htmlCode );
 			}
 
 			EcwidPlatform::encode_fields_with_emoji(

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: 4.4
 Tested up to: 6.7
-Stable tag: 6.12.29
+Stable tag: 6.12.30
 
 Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available.
 
@@ -153,6 +153,9 @@ You can use Ecwid’s built-in import tools to copy your store products from any
 * [Ecwid Help Center](http://help.ecwid.com "Ecwid Help")
 
 == Changelog ==
+= 6.12.30 - Feb 26, 2024 =
+- Fixed an issue where some links in the storefront could return a "not found" status in some cases.
+
 = 6.12.29 - Feb 21, 2024 =
 - Fixed an issue where incorrect data was sometimes displayed on the storefront page. Please update your ecommerce plugin.