Merge pull request #306 from Ecwid/dev

Dev

CHANGELOG.txt

@@ -1,4 +1,8 @@
 == Changelog == 
+= 6.12.22 - Nov 7, 2024 =
+- **WordPress 6.7 and Twenty Twenty Five theme compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.7 and try a new theme.
+- Fixed issue with links of Product Small block when it contains non-latin characters.
+
 = 6.12.21 - Oct 16, 2024 =
 - Fixed issue with Single Sign On (SSO). Single Sign-On allows your customers to have a single login for both your WordPress site and your Ecwid store. If this feature is not working properly after latests release, please update your plugin.
 - Internal improvements and optimizations.

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.21
+Version: 6.12.22
 Author URI: https://ecwid.to/ecwid-site
 License: GPLv2 or later
 */

includes/shortcodes/class-ecwid-shortcode-product.php

@@ -73,7 +73,7 @@ public function render_placeholder() {
 						$display_items[ $item ] = str_replace( '$name', $product->name, $display_items[ $item ] );
 					}
 
-					if ( $item == 'price' ) {
+					if ( $item == 'price' && ! empty( $product->price ) ) {
 						$display_items[ $item ] = str_replace( '$price', $product->price, $display_items[ $item ] );
 					}
 

lib/ecwid_catalog_entry.php

@@ -93,7 +93,13 @@ public function get_seo_link( $baseUrl = '' ) {
 				$url .= '/';
 			}
 
-			$url .= $this->_linkify( $this->_data->name ) . '-' . $this->_link_prefix . $this->_data->id;
+			preg_match( '!([^\/]+-[p|c][0-9]+)$!', $this->_data->url, $slug );
+
+			if( ! empty( $slug[1] ) ) {
+				$url .= $slug[1];
+			} else {
+				$url .= $this->_linkify( $this->_data->name ) . '-' . $this->_link_prefix . $this->_data->id;
+			}
 
 			if ( ! empty( $query ) ) {
 				$url .= '/?' . $query;

readme.txt

@@ -153,6 +153,10 @@ 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.22 - Nov 7, 2024 =
+- **WordPress 6.7 and Twenty Twenty Five theme compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.7 and try a new theme.
+- Fixed issue with links of Product Small block when it contains non-latin characters.
+
 = 6.12.21 - Oct 16, 2024 =
 - Fixed issue with Single Sign On (SSO). Single Sign-On allows your customers to have a single login for both your WordPress site and your Ecwid store. If this feature is not working properly after latests release, please update your plugin.
 - Internal improvements and optimizations.