Changeset 2628639

Timestamp:

11/12/2021 01:31:36 PM (4 years ago)

Author:

tivnet

Message:

2.8.7

Location:

wpglobus/trunk

Files:

• data/wpglobus-product-info.json (modified) (1 diff)
• includes/vendor/yoast-seo/class-wpglobus-yoastseo140.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)
• wpglobus.php (modified) (2 diffs)

wpglobus/trunk/data/wpglobus-product-info.json

@@ -1 @@
-{"multilingual-woocommerce-nets-netaxept":{"title":"{:en}Multilingual WooCommerce Nets Netaxept{:}{:ru}\u041c\u0443\u043b\u044c\u0442\u0438\u044f\u0437\u044b\u0447\u043d\u043e\u0441\u0442\u044c \u0434\u043b\u044f WooCommerce Nets Netaxept{:}","_api_new_version":"1.0.3","_api_tested_up_to":"4.9.8"},"wpglobus-multi-currency":{"title":"{:en}Multi-Currency for WooCommerce{:}{:ru}WPGlobus - \u041c\u0443\u043b\u044c\u0442\u0438\u0432\u0430\u043b\u044e\u0442\u043d\u043e\u0441\u0442\u044c \u0434\u043b\u044f WooCommerce{:}","_api_new_version":"1.1.1","_api_tested_up_to":"4.9.4"},"wpglobus-mobile-menu":{"title":"{:en}WPGlobus Mobile Menu{:}{:ru}WPGlobus Mobile Menu{:}","_api_new_version":"2.2.0","_api_tested_up_to":"5.6"},"wpglobus-header-images":{"title":"{:en}WPGlobus Header Images{:}{:ru}WPGlobus Header Images{:}","_api_new_version":"2.1.0","_api_tested_up_to":"5.5"},"wpglobus-for-ultimate-member":{"title":"{:en}WPGlobus for Ultimate Member{:}{:ru}WPGlobus \u0434\u043b\u044f \u043f\u043b\u0430\u0433\u0438\u043d\u0430 Ultimate Member{:}","_api_new_version":"1.1.0","_api_tested_up_to":"5.6"},"wpglobus-menu-visibility":{"title":"WPGlobus Menu Visibility","_api_new_version":"2.0.0","_api_tested_up_to":"5.6"},"wpglobus-for-bridge-theme":{"title":"{:en}WPGlobus for the \"Bridge\" theme{:}{:ru}WPGlobus \u0434\u043b\u044f \u0442\u0435\u043c\u044b Bridge{:}","_api_new_version":"2.4.0","_api_tested_up_to":"5.5"},"wpglobus-language-widgets":{"title":"{:en}WPGlobus Language Widgets{:}{:ru}\u042f\u0437\u044b\u043a\u0438 WPGlobus \u0434\u043b\u044f \u0432\u0438\u0434\u0436\u0435\u0442\u043e\u0432{:}","_api_new_version":"2.1.0","_api_tested_up_to":"5.7"},"wpglobus-multilingual-popups":{"title":"{:en}WPGlobus Multilingual Popups{:}{:ru}WPGlobus Multilingual Popups{:}","_api_new_version":"1.4.0","_api_tested_up_to":"5.7"},"woocommerce-wpglobus":{"title":"{:en}WPGlobus for WooCommerce{:}{:ru}\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 WooCommerce WPGlobus{:}","_api_new_version":"5.8.5","_api_tested_up_to":"5.8"},"wpglobus-multilingual-notices":{"title":"{:en}WPGlobus Multilingual Notices{:}{:ru}WPGlobus - \u043c\u043d\u043e\u0433\u043e\u044f\u0437\u044b\u0447\u043d\u044b\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f{:}","_api_new_version":"2.9.2","_api_tested_up_to":"5.8"},"wpglobus-plus":{"title":"{:en}WPGlobus Plus multilingual extension{:}{:ru}WPGlobus \u041f\u043b\u044e\u0441{:}","_api_new_version":"1.8.2","_api_tested_up_to":"5.8"}}
+{"multilingual-woocommerce-nets-netaxept":{"title":"{:en}Multilingual WooCommerce Nets Netaxept{:}{:ru}\u041c\u0443\u043b\u044c\u0442\u0438\u044f\u0437\u044b\u0447\u043d\u043e\u0441\u0442\u044c \u0434\u043b\u044f WooCommerce Nets Netaxept{:}","_api_new_version":"1.0.3","_api_tested_up_to":"4.9.8"},"wpglobus-multi-currency":{"title":"{:en}Multi-Currency for WooCommerce{:}{:ru}WPGlobus - \u041c\u0443\u043b\u044c\u0442\u0438\u0432\u0430\u043b\u044e\u0442\u043d\u043e\u0441\u0442\u044c \u0434\u043b\u044f WooCommerce{:}","_api_new_version":"1.1.1","_api_tested_up_to":"4.9.4"},"wpglobus-mobile-menu":{"title":"{:en}WPGlobus Mobile Menu{:}{:ru}WPGlobus Mobile Menu{:}","_api_new_version":"2.2.0","_api_tested_up_to":"5.6"},"wpglobus-for-ultimate-member":{"title":"{:en}WPGlobus for Ultimate Member{:}{:ru}WPGlobus \u0434\u043b\u044f \u043f\u043b\u0430\u0433\u0438\u043d\u0430 Ultimate Member{:}","_api_new_version":"1.1.0","_api_tested_up_to":"5.6"},"wpglobus-menu-visibility":{"title":"WPGlobus Menu Visibility","_api_new_version":"2.0.0","_api_tested_up_to":"5.6"},"wpglobus-for-bridge-theme":{"title":"{:en}WPGlobus for the \"Bridge\" theme{:}{:ru}WPGlobus \u0434\u043b\u044f \u0442\u0435\u043c\u044b Bridge{:}","_api_new_version":"2.4.0","_api_tested_up_to":"5.5"},"wpglobus-language-widgets":{"title":"{:en}WPGlobus Language Widgets{:}{:ru}\u042f\u0437\u044b\u043a\u0438 WPGlobus \u0434\u043b\u044f \u0432\u0438\u0434\u0436\u0435\u0442\u043e\u0432{:}","_api_new_version":"2.1.0","_api_tested_up_to":"5.7"},"wpglobus-multilingual-popups":{"title":"{:en}WPGlobus Multilingual Popups{:}{:ru}WPGlobus Multilingual Popups{:}","_api_new_version":"1.4.0","_api_tested_up_to":"5.7"},"woocommerce-wpglobus":{"title":"{:en}WPGlobus for WooCommerce{:}{:ru}\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435 WooCommerce WPGlobus{:}","_api_new_version":"5.8.5","_api_tested_up_to":"5.8"},"wpglobus-multilingual-notices":{"title":"{:en}WPGlobus Multilingual Notices{:}{:ru}WPGlobus - \u043c\u043d\u043e\u0433\u043e\u044f\u0437\u044b\u0447\u043d\u044b\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f{:}","_api_new_version":"2.9.2","_api_tested_up_to":"5.8"},"wpglobus-plus":{"title":"{:en}WPGlobus Plus multilingual extension{:}{:ru}WPGlobus \u041f\u043b\u044e\u0441{:}","_api_new_version":"1.8.2","_api_tested_up_to":"5.8"},"wpglobus-header-images":{"title":"{:en}WPGlobus Header Images{:}{:ru}WPGlobus Header Images{:}","_api_new_version":"2.2.0","_api_tested_up_to":"5.8"}}

wpglobus/trunk/includes/vendor/yoast-seo/class-wpglobus-yoastseo140.php

@@ -205 +205 @@
              */
             add_filter( 'get_post_metadata', array( __CLASS__, 'filter__get_post_metadata' ), 6, 4 );
+
+            /**
+             * Filter metadata during sitemap generation.
+             * @since 2.8.7
+             */         
+            add_filter( 'get_post_metadata', array( __CLASS__, 'filter__sitemap_get_post_metadata' ), 5, 4 );
             
             /**
@@ -748 +754 @@
      * @see function function get_value() in wordpress-seo\inc\class-wpseo-meta.php
      */
-    public static function filter__get_post_metadata( $check, $object_id, $meta_key, $single  ) {
+    public static function filter__get_post_metadata( $check, $object_id, $meta_key, $single ) {
 
         global $post;
@@ -793 +799 @@
         return $check;
     }
+    
+    /**
+     * Filter metadata during sitemap generation.
+     *
+     * @since 2.8.7
+     * 
+     * If post has Canonical URL from Yoast, then it interferes during multilingual sitemap generation.
+     * @see `_yoast_wpseo_canonical` meta
+     * @see `canonical` variable in `get_url($post)` function in wordpress-seo\inc\sitemaps\class-post-type-sitemap-provider.php
+     * @see `init` for query_vars in wordpress-seo\inc\sitemaps\class-sitemaps-router.php
+     */
+    public static function filter__sitemap_get_post_metadata( $check, $object_id, $meta_key, $single ) {
+        
+        $language = WPGlobus::Config()->language;
+        
+        if ( $language === WPGlobus::Config()->default_language ) {
+            return $check;
+        }
+        
+        global $wp_query;
+        
+        if ( ! isset( $wp_query->query_vars['sitemap'] ) ) {
+            return $check;
+        }
+        
+        static $_done = array();    
+        if ( isset( $_done[$object_id] ) && $_done[$object_id] ) {
+            return $check;
+        }
+        
+        $meta_type = 'post';    
+        
+        $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+        
+        if ( ! empty( $meta_cache['_yoast_wpseo_canonical'][0] ) ) {
+            
+            /**
+             * Unset `_yoast_wpseo_canonical` during generating sitemap.
+             * We can use WPGlobus_Utils::localize_url, but we should be added fix for WPGlobus Plus too.
+             * Don't use `get_permalink` here.
+             */
+            unset( $meta_cache['_yoast_wpseo_canonical'] );
+            wp_cache_replace( $object_id, $meta_cache, $meta_type . '_meta' );
+        }       
+        
+        unset( $meta_cache ); 
+
+        $_done[$object_id] = true;
+        
+        return $check;
+    }   
     
     /**

wpglobus/trunk/readme.txt

@@ -221 +221 @@
 == Changelog ==
 
+= 2.8.7 =
+* (Vendor/Yoast) Fixed: posts having the `Canonical` meta field set were missing in the `sitemap.xml`.
+
 = 2.8.6 =
 * (Core/Widgets) Added support for the widgets block editor.

wpglobus/trunk/wpglobus.php

@@ -16 +16 @@
  * Text Domain: wpglobus
  * Domain Path: /languages/
- * Version: 2.8.6
+ * Version: 2.8.7
  * Author: WPGlobus
  * Author URI: https://wpglobus.com/
@@ -45 +45 @@
 }
 
-define( 'WPGLOBUS_VERSION', '2.8.6' );
+define( 'WPGLOBUS_VERSION', '2.8.7' );
 define( 'WPGLOBUS_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 define( 'WPGLOBUS_AJAX', 'wpglobus-ajax' );