Merge pull request #335 from Ecwid/dev

Dev

Author: meteor-ec

includes/class-ec-store-oembed.php

@@ -40,7 +40,7 @@ public static function get_content() {
 		if ( ! empty( $categories->items ) ) {
 			foreach ( $categories->items as $category ) {
 				$category                 = Ecwid_Category::get_by_id( $category->id );
-				$items[ $category->link ] = $category->name;
+				$items[ $category->url ] = $category->name;
 				if ( count( $items ) >= $max_items ) {
 					$see_more = true;
 					break;
@@ -71,7 +71,7 @@ public static function get_content() {
 			if ( $products->items ) {
 				foreach ( $products->items as $product ) {
 					$product                 = Ecwid_Product::get_by_id( $product->id );
-					$items[ $product->link ] = $product->name;
+					$items[ $product->url ] = $product->name;
 					if ( count( $items ) >= $max_items ) {
 						$see_more = true;
 						break;
@@ -102,15 +102,21 @@ public static function ecwid_oembed_url( $url, $permalink, $format ) {
 			return $url;
 		}
 
-		$params = Ecwid_Seo_Links::maybe_extract_html_catalog_params();
-
-		if ( $params['mode'] == 'product' ) {
-			$product   = Ecwid_Product::get_by_id( $params['id'] );
-			$permalink = $product->link;
-		} elseif ( $params['mode'] == 'category' ) {
-			$category  = Ecwid_Category::get_by_id( $params['id'] );
-			$permalink = $category->link;
-		}
+        if( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+            $permalink = trailingslashit( $permalink );
+            $slug = Ecwid_Static_Page::get_current_storefront_page_slug();
+            $permalink .= $slug;
+        } else {
+            $params = Ecwid_Seo_Links::maybe_extract_html_catalog_params();
+
+            if ( $params['mode'] == 'product' ) {
+                $product   = Ecwid_Product::get_by_id( $params['id'] );
+                $permalink = $product->link;
+            } elseif ( $params['mode'] == 'category' ) {
+                $category  = Ecwid_Category::get_by_id( $params['id'] );
+                $permalink = $category->link;
+            }
+        }
 
 		$url = add_query_arg(
 			array(

includes/class-ecwid-html-meta.php

@@ -123,16 +123,7 @@ public function wp_head_last() {
 	protected function _print_description() {
 		$description_html = false;
 
-        if( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
-            $slug = Ecwid_Static_Page::get_current_storefront_page_slug();
-            $noindex_pages = Ecwid_Seo_Links::get_noindex_pages();
-            
-            $is_internal_catalog_page = ! empty( $slug ) && ! in_array( $slug, $noindex_pages );
-        } else {
-            $is_internal_catalog_page = Ecwid_Seo_Links::is_product_browser_url();
-        }
-
-		if ( ecwid_is_applicable_escaped_fragment() || $is_internal_catalog_page ) {
+		if ( ecwid_is_applicable_escaped_fragment() || Ecwid_Seo_Links::is_product_browser_url() ) {
 			$description_html = Ecwid_Static_Page::get_meta_description_html();
 		} elseif ( Ecwid_Store_Page::is_store_page() ) {
 			$set_metadesc = false;

includes/class-ecwid-seo-links.php

@@ -398,11 +398,19 @@ public static function maybe_extract_html_catalog_params() {
 	}
 
 	public static function is_product_browser_url( $url = '' ) {
-		if ( ! $url ) {
-			$url = add_query_arg( null, null );
-		}
 
-		return preg_match( self::_get_pb_preg_pattern(), $url );
+        if( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+            $slug = Ecwid_Static_Page::get_current_storefront_page_slug();
+            $noindex_pages = Ecwid_Seo_Links::get_noindex_pages();
+            
+            return ! empty( $slug ) && ! in_array( $slug, $noindex_pages );
+        } else {
+            if ( ! $url ) {
+                $url = add_query_arg( null, null );
+            }
+    
+            return preg_match( self::_get_pb_preg_pattern(), $url );
+        }
 	}
 
 	public static function is_seo_link() {

includes/class-ecwid-static-page.php

@@ -397,7 +397,18 @@ public static function get_js_code() {
 	}
 
 	public static function get_title() {
-		return self::get_data_field( 'title' );
+		$title = self::get_data_field( 'title' );
+
+        if( empty( $title ) ) {
+            $meta_description = self::get_data_field( 'metaDescriptionHtml' );
+
+            if( ! empty( $meta_description ) ) {
+                $title = preg_replace( '/<title>(.*?)<\/title>(.*)/is', '$1', $meta_description );
+                $title = trim( $title );
+            }            
+        }
+
+        return $title;
 	}
 
 	public static function get_meta_description_html() {