Changeset 3101429

Timestamp:

06/11/2024 10:00:22 PM (2 months ago)

Author:

arcangelini

Message:

Update Editing Toolkit Plugin to 4.25571

Location:

full-site-editing/trunk

Files:

• build_meta.json (modified) (1 diff)
• full-site-editing-plugin.php (modified) (2 diffs)
• help-center/class-help-center.php (modified) (4 diffs)
• readme.txt (modified) (1 diff)

full-site-editing/trunk/build_meta.json

@@ -1 +1 @@
 {
-  "build_number": "4.25512",
-  "cache_buster": "3b05501eeb5",
-  "commit_hash": "3b05501eeb58a5ff6939997e3374cbd5ede80a62",
-  "commit_url": "https://github.com/Automattic/wp-calypso/commit/3b05501eeb58a5ff6939997e3374cbd5ede80a62"
+  "build_number": "4.255",
+  "cache_buster": "",
+  "commit_hash": "",
+  "commit_url": "https://github.com/Automattic/wp-calypso/commit/"
 }

full-site-editing/trunk/full-site-editing-plugin.php

@@ -3 +3 @@
  * Plugin Name: WordPress.com Editing Toolkit
  * Description: Enhances your page creation workflow within the Block Editor.
- * Version: 4.25512
+ * Version: 4.255
  * Author: Automattic
  * Author URI: https://automattic.com/wordpress-plugins/
@@ -43 +43 @@
  * @var string
  */
-define( 'A8C_ETK_PLUGIN_VERSION', '4.25512' );
+define( 'A8C_ETK_PLUGIN_VERSION', '4.255' );
 
 // Always include these helper files for dotcom FSE.

full-site-editing/trunk/help-center/class-help-center.php

@@ -49 +49 @@
         }
 
-        $this->asset_file = include plugin_dir_path( __FILE__ ) . $this->is_jetpack_connected() ? 'dist/help-center.asset.php' : 'dist/help-center-disconnected.asset.php';
+        $file             = $this->is_jetpack_disconnected() ? 'dist/help-center-disconnected.asset.php' : 'dist/help-center.asset.php';
+        $this->asset_file = include plugin_dir_path( __FILE__ ) . $file;
         $this->version    = $this->asset_file['version'];
 
@@ -92 +93 @@
         wp_enqueue_script(
             'help-center-script',
-            plugins_url( $this->is_jetpack_connected() ? 'dist/help-center.min.js' : 'dist/help-center-disconnected.min.js', __FILE__ ),
+            plugins_url( $this->is_jetpack_.min.js', __FILE__ ),
             is_array( $script_dependencies ) ? $script_dependencies : array(),
             $this->version,
@@ -287 +288 @@
      * Returns true if the current user is connected through Jetpack
      */
-    public function is_jetpack_connected() {
+    public function is_jetpack_connected() {
         $user_id = get_current_user_id();
-        return ( new Connection_Manager( 'jetpack' ) )->is_user_connected( $user_id );
+        $blog_id = get_current_blog_id();
+
+        if ( defined( 'IS_ATOMIC' ) && IS_ATOMIC ) {
+            return ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected( $user_id );
+        }
+
+        if ( true === apply_filters( 'is_jetpack_site', false, $blog_id ) ) {
+            return ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected( $user_id );
+        }
+
+        return false;
     }
 
@@ -333 +344 @@
                         'title'  => file_get_contents( plugin_dir_path( __FILE__ ) . 'src/help-icon.svg', true ),
                         'parent' => 'top-secondary',
-                        'href'   => $this->is_jetpack_connected() ? false : 'https://wordpress.com/support/',
+                        // phpcs:ignore WPCOM.I18nRules.LocalizedUrl.UnlocalizedUrl
+                        'href'   => $this->is_jetpack_disconnected() ? 'https://wordpress.com/support/' : false,
                         'meta'   => array(
                             'html'   => '<div id="help-center-masterbar" />',

full-site-editing/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.5
 Tested up to: 6.3
-Stable tag: 4.25512
+Stable tag: 4.255
 Requires PHP: 5.6.20
 License: GPLv2 or later