Changeset 2614698

Timestamp:

10/15/2021 11:58:25 AM (4 years ago)

Author:

tivnet

Message:

2.8.4

Location:

wpglobus/trunk

Files:

• includes/builders/class-wpglobus-builders.php (modified) (8 diffs)
• includes/builders/yoast_seo/addon-yoast_seo.php (added)
• includes/class-wpglobus-widget.php (modified) (2 diffs)
• includes/js/wpglobus-media.js (modified) (2 diffs)
• includes/js/wpglobus-media.min.js (modified) (1 diff)
• includes/vendor/yoast-seo/class-wpglobus-yoastseo140.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• wpglobus.php (modified) (2 diffs)

wpglobus/trunk/includes/builders/class-wpglobus-builders.php

@@ -99 +99 @@
             );
 
-            if ( file_exists( WP_PLUGIN_DIR . '/wordpress-seo-premium/wp-seo-premium.php' ) ) {
-
-                self::$add_on['yoast_seo'] = array(
-                    'id'                    => 'yoast_seo',
-                    'role'                  => 'builder',
-                    'admin_bar_label'       => 'Add-on',
-                    'supported_min_version' => '7.7',
-                    'const'                 => 'WPSEO_VERSION',
-                    'plugin_name'           => 'Yoast SEO Premium',
-                    'plugin_uri'            => 'https://yoast.com/wordpress/plugins/seo/',
-                    'path'                  => 'wordpress-seo-premium/wp-seo-premium.php',
-                    'stage'                 => 'production',
-                );
-
-            }
-
             /**
+             * Yoast SEO add-ons.
              * @since 2.3.11
+             * @since 2.8.4 Moved to separate file.
              */
-            $_file = 'wordpress-seo/wp-seo.php';
-            $_plugin_name = 'Yoast SEO';
-            if ( defined( 'WPGLOBUS_YOAST_PLUGIN_FILE' ) ) {
-                $_file = WPGLOBUS_YOAST_PLUGIN_FILE;
-                $_plugin_name = 'Yoast SEO('.$_file.')';
-            }
-            
-            if ( file_exists( WP_PLUGIN_DIR . '/' . $_file ) ) {
-
-                if ( ! defined( 'WPSEO_PREMIUM_PLUGIN_FILE' ) ) {
-
-                    self::$add_on['yoast_seo'] = array(
-                        'id'                    => 'yoast_seo',
-                        'role'                  => 'builder',
-                        'admin_bar_label'       => 'Add-on',
-                        'supported_min_version' => '7.7',
-                        'const'                 => 'WPSEO_VERSION',
-                        'plugin_name'           => $_plugin_name,
-                        'plugin_uri'            => 'https://wordpress.org/plugins/wordpress-seo/',
-                        'path'                  => $_file,
-                        'stage'                 => 'production',
-                    );
-
-                }
-            }
-
+            $_addon_dir = dirname( __FILE__ ) . '/yoast_seo/addon-yoast_seo.php';
+            if ( file_exists($_addon_dir) ) {
+                require_once $_addon_dir;
+            }
+
+            /**
+             * WooCommerce.
+             */
             self::$add_on['woocommerce'] = array(
                 'id'                    => 'woocommerce',
@@ -1255 +1223 @@
             if ( defined( 'WPSEO_VERSION' ) ) {
 
+                /**
+                 * @since 2.8.4
+                 */
+                $id = 'yoast_seo';
+                $version = WPSEO_VERSION;
+
+                if ( version_compare( WPSEO_VERSION, '17.3', '>=' ) ) {
+                    /** @see code in addon-yoast_seo.php */
+
+                    $id = self::$add_on['yoast_seo']['id'];
+                    
+                    if ( defined( 'WPSEO_PREMIUM_VERSION' ) ) {
+                        $id = self::$add_on['yoast_seo_premium']['id'];
+                        $version = WPSEO_PREMIUM_VERSION;
+                    }
+                }
+
                 /** @global string $pagenow */
                 global $pagenow;
@@ -1278 +1263 @@
 
                     $_attrs = array(
-                        'id'           => 'yoast_seo',
-                        'version'      => WPSEO_VERSION,
+                        'id'           => $id,
+                        'version'      => $version,
                         'class'        => 'WPGlobus_Yoast_SEO',
                         'builder_page' => false,
@@ -1309 +1294 @@
                     return $attrs;
 
-                } elseif ( 'term.php' === $pagenow ) {
+                } else if ( 'term.php' === $pagenow ) {
 
                     $tax = empty( $_GET['taxonomy'] ) ? false : sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ); // phpcs:ignore WordPress.CSRF.NonceVerification
@@ -1316 +1301 @@
 
                         $_attrs = array(
-                            'id'           => 'yoast_seo',
-                            'version'      => WPSEO_VERSION,
+                            'id'           => $id,
+                            'version'      => $version,
                             'class'        => 'WPGlobus_Yoast_SEO',
                             'builder_page' => false,
@@ -1339 +1324 @@
                         return $attrs;
                     }
-                } elseif ( 'edit-tags.php' === $pagenow ) {
+                } else if ( 'edit-tags.php' === $pagenow ) {
                     /**
                      * Case when Update button was clicked on term.php page .
@@ -1349 +1334 @@
 
                         $_attrs = array(
-                            'id'           => 'yoast_seo',
-                            'version'      => WPSEO_VERSION,
+                            'id'           => $id,
+                            'version'      => $version,
                             'class'        => 'WPGlobus_Yoast_SEO',
                             'builder_page' => false,
@@ -1374 +1359 @@
 
             return false;
-
         }
 

wpglobus/trunk/includes/class-wpglobus-widget.php

@@ -47 +47 @@
     public function widget( $args, $instance ) {
 
-        if ( ! empty( $instance['type'] ) ) {
-            $type = $instance['type'];
-        } else {
-            $type = 'flags';
-        }
+        $type = ! empty( $instance['type'] ) ? $instance['type'] : 'flags';
+
+        /**
+         * @since 2.8.4
+         */
+        $title = ! empty( $instance['title'] ) ? $instance['title'] : 'Language switcher';
 
         $inside = '';
@@ -152 +153 @@
         $flag_classes = array();
 
+        /** 
+         * @since 2.8.4
+         *
+         * This filter is documented in wp-includes/widgets/class-wp-widget-pages.php
+         */
+        $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
         echo $args['before_widget']; // WPCS: XSS ok.
-        if ( ! empty( $instance['title'] ) ) {
-            echo $args['before_title'] . $instance['title'] . $args['after_title']; // WPCS: XSS ok.
+        if ( ! empty( $title ) ) {
+            echo $args['before_title'] . $title . $args['after_title']; // WPCS: XSS ok.
         }
         foreach ( $enabled_languages as $language ) :

wpglobus/trunk/includes/js/wpglobus-media.js

@@ -33 +33 @@
             api.iniSet();
             api.setContent();
+            api.translate();
             api.attachListeners();
         },
@@ -53 +54 @@
                     $('#'+id).val( WPGlobusCore.TextFilter( api.content[id], WPGlobusMedia.language, 'RETURN_EMPTY' ) );
                 });
+            }
+        },
+        translate: function() {
+            /* Translate post title in Suvmit Box */
+            var $postTitle = $('#submitpost .misc-pub-uploadedto strong');
+            if ( $postTitle.length == 1 ) {
+                var title = $postTitle.text();
+                if ( '' != title ) {
+                    $postTitle.text(WPGlobusCore.TextFilter(title));
+                }
             }
         },

wpglobus/trunk/includes/js/wpglobus-media.min.js

@@ -1 @@
-!function(n){"use strict";var a;"undefined"!=typeof WPGlobusCore&&"undefined"!=typeof WPGlobusMedia&&(a={content:{},save:!0,resetContent:!0,init:function(t){var e=n(".wpglobus-post-body-tabs");1==e.length&&(e.insertBefore(".wp_attachment_details"),e.tabs(),a.iniSet(),a.setContent(),a.attachListeners())},iniSet:function(){n.each(WPGlobusMedia.attachment,function(t,e){a.content[e]=n("#"+e).val(),n("#"+e).addClass("wpglobus-translatable")})},setContent:function(t){(t=void 0===t?!1:t)?n.each(WPGlobusMedia.attachment,function(t,e){n("#"+e).val(a.content[e])}):n.each(WPGlobusMedia.attachment,function(t,e){n("#"+e).val(WPGlobusCore.TextFilter(a.content[e],WPGlobusMedia.language,"RETURN_EMPTY"))})},attachListeners:function(){n(document).on("tabsactivate",".wpglobus-post-body-tabs",function(t,e){WPGlobusMedia.language=e.newTab[0].dataset.language,a.setContent()}),n.each(WPGlobusMedia.attachment,function(t,e){n(document).on("keyup","#"+e,function(t){a.content[t.currentTarget.id]=WPGlobusCore.getString(a.content[t.currentTarget.id],t.currentTarget.value,WPGlobusMedia.language)})}),n(document).on("mouseenter","#publish",function(t){a.setContent(a.save)}).on("mouseleave","#publish",function(t){a.resetContent&&a.setContent(),a.resetContent=!0}).on("click","#publish",function(t){a.resetContent=!1}),n(document).ajaxSend(function(t,e,n){void 0!==n.data&&-1!=n.data.indexOf("action=send-attachment-to-editor")&&(n.data=n.data+"&wpglobusLanguageTab="+WPGlobusAdmin.currentTab)})}},(WPGlobusMedia=n.extend({},WPGlobusMedia,a)).init())}(jQuery);
+!function(n){"use strict";var a;"undefined"!=typeof WPGlobusCore&&"undefined"!=typeof WPGlobusMedia&&(a={content:{},save:!0,resetContent:!0,init:function(t){var e=n(".wpglobus-post-body-tabs");1==e.length&&(e.insertBefore(".wp_attachment_details"),e.tabs(),a.iniSet(),a.setContent(),a.translate(),a.attachListeners())},iniSet:function(){n.each(WPGlobusMedia.attachment,function(t,e){a.content[e]=n("#"+e).val(),n("#"+e).addClass("wpglobus-translatable")})},setContent:function(t){(t=void 0===t?!1:t)?n.each(WPGlobusMedia.attachment,function(t,e){n("#"+e).val(a.content[e])}):n.each(WPGlobusMedia.attachment,function(t,e){n("#"+e).val(WPGlobusCore.TextFilter(a.content[e],WPGlobusMedia.language,"RETURN_EMPTY"))})},translate:function(){var t,e=n("#submitpost .misc-pub-uploadedto strong");1!=e.length||""!=(t=e.text())&&e.text(WPGlobusCore.TextFilter(t))},attachListeners:function(){n(document).on("tabsactivate",".wpglobus-post-body-tabs",function(t,e){WPGlobusMedia.language=e.newTab[0].dataset.language,a.setContent()}),n.each(WPGlobusMedia.attachment,function(t,e){n(document).on("keyup","#"+e,function(t){a.content[t.currentTarget.id]=WPGlobusCore.getString(a.content[t.currentTarget.id],t.currentTarget.value,WPGlobusMedia.language)})}),n(document).on("mouseenter","#publish",function(t){a.setContent(a.save)}).on("mouseleave","#publish",function(t){a.resetContent&&a.setContent(),a.resetContent=!0}).on("click","#publish",function(t){a.resetContent=!1}),n(document).ajaxSend(function(t,e,n){void 0!==n.data&&-1!=n.data.indexOf("action=send-attachment-to-editor")&&(n.data=n.data+"&wpglobusLanguageTab="+WPGlobusAdmin.currentTab)})}},(WPGlobusMedia=n.extend({},WPGlobusMedia,a)).init())}(jQuery);

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

@@ -708 +708 @@
                      * @since 2.8.1
                      */
-                    if ( empty( $meta_cache['_yoast_wpseo_focuskw'][0] ) ) {
+                    if ( empty( $meta_cache['_yoast_wpseo_title'][0] ) ) {
                         $__title = self::get_option( 'wpseo_titles', 'title-' . $presentation->model->object_sub_type );
                         if ( ! is_null($__title) ) {

wpglobus/trunk/readme.txt

@@ -221 +221 @@
 == Changelog ==
 
+= 2.8.4 =
+* (Core/Widget class) Added `widget_title` filter.
+* (Vendor/Yoast) Fixed PHP Notice: `Undefined index: _yoast_wpseo_title`.
+* (Builders/Yoast) Added compatibility with Yoast from v.17.3.
+* (Core/Media) Translate post title in submit box.
+
 = 2.8.3 =
 * (Core/JS) Added trigger handler `wpglobus_post_title`.

wpglobus/trunk/wpglobus.php

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