Changeset 2675847

Timestamp:

02/09/2022 05:05:54 PM (4 years ago)

Author:

mattwiebe

Message:

Update Editing Toolkit Plugin to 3.26678

Location:

full-site-editing/trunk

Files:

• full-site-editing-plugin.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• wpcom-universal-themes/index.php (modified) (4 diffs)

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

full-site-editing/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.5
 Tested up to: 5.6
-Stable tag: 3.26587
+Stable tag: 3.26678
 Requires PHP: 5.6.20
 License: GPLv2 or later

full-site-editing/trunk/wpcom-universal-themes/index.php

@@ -101 +101 @@
     add_action( 'admin_bar_menu', 'gutenberg_adminbar_items', 50 );
     add_action( 'admin_menu', __NAMESPACE__ . '\hide_nav_menus_submenu' );
-
-    // Hides the AMP menu.
-    remove_action( 'admin_menu', 'amp_add_customizer_link' );
-
     remove_action( 'init', __NAMESPACE__ . '\hide_template_cpts', 11 );
     remove_action( 'restapi_theme_init', __NAMESPACE__ . '\hide_template_cpts', 11 );
@@ -123 +119 @@
     remove_action( 'admin_bar_menu', 'gutenberg_adminbar_items', 50 );
     remove_action( 'admin_menu', __NAMESPACE__ . '\hide_nav_menus_submenu' );
-
-    // Shows the AMP menu.
-    add_action( 'admin_menu', 'amp_add_customizer_link' );
 
     if ( defined( 'REST_API_REQUEST' ) && true === REST_API_REQUEST ) {
@@ -151 +144 @@
     }
 
-    // AMP registration on the default 10 priority is too early and confuses the current
-    // Gutenberg (v12.5.1 at this comment's writing) `gutenberg_remove_legacy_pages` function
-    // into mistaking it for the Customizer proper.
-    if ( function_exists( 'amp_add_customizer_link' ) ) {
-        remove_action( 'admin_menu', 'amp_add_customizer_link' );
-        add_action( 'admin_menu', 'amp_add_customizer_link', 11 );
-    }
+    // Amp plugin helper.
+    add_action( 'admin_menu', __NAMESPACE__ . '\maybe_juggle_amp_priority', 0 );
 
     if ( apply_filters( 'a8c_hide_core_fse_activation', false ) ) {
@@ -181 +169 @@
     remove_action( 'admin_menu', __NAMESPACE__ . '\add_submenu' );
     remove_action( 'admin_init', __NAMESPACE__ . '\init_settings' );
+    remove_action( 'admin_menu', __NAMESPACE__ . '\maybe_juggle_amp_priority', 0 );
+}
+
+/**
+ * AMP registration on the default 10 priority is too early and confuses the current Gutenberg
+ * plugin's `gutenberg_remove_legacy_pages` function into mistaking it for the Customizer proper.
+ *
+ * This will be fixed once https://github.com/WordPress/gutenberg/pull/38598 is released.
+ *
+ * @return void
+ */
+function maybe_juggle_amp_priority() {
+    if ( ! function_exists( 'amp_add_customizer_link' ) || ! has_action( 'admin_menu', 'amp_add_customizer_link' ) ) {
+        return;
+    }
+
+    remove_action( 'admin_menu', 'amp_add_customizer_link' );
+    add_action( 'admin_menu', 'amp_add_customizer_link', 11 );
 }