Changeset 2580505

Timestamp:

08/09/2021 07:09:21 PM (5 years ago)

Author:

mattwiebe

Message:

Update Editing Toolkit Plugin to 3.12771

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) (1 diff)

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.12738
+ * Version: 3.12771
  * Author: Automattic
  * Author URI: https://automattic.com/wordpress-plugins/
@@ -43 +43 @@
  * @var string
  */
-define( 'A8C_ETK_PLUGIN_VERSION', '3.12738' );
+define( 'A8C_ETK_PLUGIN_VERSION', '3.12771' );
 
 // 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.12738
+Stable tag: 3.12771
 Requires PHP: 5.6.20
 License: GPLv2 or later

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

@@ -88 +88 @@
     remove_action( 'admin_bar_menu', 'gutenberg_adminbar_items', 50 );
     remove_filter( 'menu_order', 'gutenberg_menu_order' );
-    add_action( 'init', __NAMESPACE__ . '\hide_template_cpts', 11 );
-    add_action( 'restapi_theme_init', __NAMESPACE__ . '\hide_template_cpts', 11 );
+    if ( defined( 'REST_API_REQUEST' ) && true === REST_API_REQUEST ) {
+        // Do not hook to init during the REST API requests, as it causes PHP warnings
+        // while loading the alloptions (unable to access wp_0_ prefixed tables).
+        // Use the restapi_theme_init hook instead.
+        add_action( 'restapi_theme_init', __NAMESPACE__ . '\hide_template_cpts', 11 );
+    } else {
+        add_action( 'init', __NAMESPACE__ . '\hide_template_cpts', 11 );
+    }
     add_filter( 'block_editor_settings_all', __NAMESPACE__ . '\hide_fse_blocks' );
 }