Changeset 2868945

Timestamp:

02/21/2023 06:11:48 PM (3 years ago)

Author:

Copons

Message:

Update Editing Toolkit Plugin to 3.57000

Location:

full-site-editing/trunk

Files:

• build_meta.txt (modified) (1 diff)
• full-site-editing-plugin.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• wpcom-global-styles/index.php (modified) (3 diffs)

full-site-editing/trunk/build_meta.txt

@@ -1 @@
-commit_hash=d6273a1114cf166cc5b91cf85b4e26e13244a6d0
-commit_url=https://github.com/Automattic/wp-calypso/commit/d6273a1114cf166cc5b91cf85b4e26e13244a6d0
-build_number=3.56963
+commit_hash=e40203ed2a04685a44bd0850e5381f95d056603f
+commit_url=https://github.com/Automattic/wp-calypso/commit/e40203ed2a04685a44bd0850e5381f95d056603f
+build_number=3.57000

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: 3.56963
+ * Version: 3.57000
  * Author: Automattic
  * Author URI: https://automattic.com/wordpress-plugins/
@@ -43 +43 @@
  * @var string
  */
-define( 'A8C_ETK_PLUGIN_VERSION', '3.56963' );
+define( 'A8C_ETK_PLUGIN_VERSION', '3.57000' );
 
 // Always include these helper files for dotcom FSE.

full-site-editing/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.5
 Tested up to: 6.0
-Stable tag: 3.56963
+Stable tag: 3.57000
 Requires PHP: 5.6.20
 License: GPLv2 or later

full-site-editing/trunk/wpcom-global-styles/index.php

@@ -144 +144 @@
  */
 function wpcom_global_styles_enqueue_assets() {
-    if ( ! wpcom_should_limit_global_styles() ) {
+    if (
+        ! wpcom_global_styles_current_user_can_edit_wp_global_styles() ||
+        ! wpcom_should_limit_global_styles() ||
+        ! wpcom_global_styles_in_use()
+    ) {
         return;
     }
@@ -256 +260 @@
 
 /**
+ * Checks if the current user can edit the `wp_global_styles` post type.
+ *
+ * @param int $blog_id Blog ID.
+ * @return bool Whether the current user can edit the `wp_global_styles` post type.
+ */
+function wpcom_global_styles_current_user_can_edit_wp_global_styles( $blog_id = 0 ) {
+    if ( ! $blog_id ) {
+        $blog_id = get_current_blog_id();
+    }
+    switch_to_blog( $blog_id );
+    $wp_global_styles_cpt = get_post_type_object( 'wp_global_styles' );
+    restore_current_blog();
+    return current_user_can( $wp_global_styles_cpt->cap->publish_posts );
+}
+
+/**
  * Checks if the current blog has custom styles in use.
  *
@@ -310 +330 @@
     }
 
-    switch_to_blog( $blog_id );
-
     // If the current user cannot modify the `wp_global_styles` CPT, the exemption check is not needed;
     // other conditions will determine whether they can use GS.
-    $wp_global_styles_cpt = get_post_type_object( 'wp_global_styles' );
-    if ( ! current_user_can( $wp_global_styles_cpt->cap->publish_posts ) ) {
-        restore_current_blog();
-        return false;
-    }
+    if ( ! wpcom_global_styles_current_user_can_edit_wp_global_styles( $blog_id ) ) {
+        return false;
+    }
+
+    switch_to_blog( $blog_id );
 
     add_blog_sticker( 'wpcom-premium-global-styles-exemption-checked', null, null, $blog_id );