From 973e4ce6110baae1e71dded66ee2b8ff4fe57303 Mon Sep 17 00:00:00 2001 From: Philip Jackson Date: Wed, 17 Mar 2021 11:56:33 +1300 Subject: [PATCH] Revert "New Page Layout Picker: refresh page pattern cache when site lang changes (#51087)" (#51120) This reverts commit dc7c8451bf76f183be158ba531c8ae049b69acf7. --- .../editing-toolkit-plugin/full-site-editing-plugin.php | 6 +----- .../starter-page-templates/class-starter-page-templates.php | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/editing-toolkit/editing-toolkit-plugin/full-site-editing-plugin.php b/apps/editing-toolkit/editing-toolkit-plugin/full-site-editing-plugin.php index 2c166fdf7cabd..a755c8088bd4c 100644 --- a/apps/editing-toolkit/editing-toolkit-plugin/full-site-editing-plugin.php +++ b/apps/editing-toolkit/editing-toolkit-plugin/full-site-editing-plugin.php @@ -145,11 +145,7 @@ function load_timeline_block() { function load_common_module() { require_once __DIR__ . '/common/index.php'; } -// Use a custom priority so that the common code is loaded before any of -// the other modules. This way it can be called very early in the other -// modules (e.g. during `__construct`). The default priority is 10, so -// using 9 to load just before. -add_action( 'plugins_loaded', __NAMESPACE__ . '\load_common_module', 9 ); +add_action( 'plugins_loaded', __NAMESPACE__ . '\load_common_module' ); /** * Load Editor Site Launch. diff --git a/apps/editing-toolkit/editing-toolkit-plugin/starter-page-templates/class-starter-page-templates.php b/apps/editing-toolkit/editing-toolkit-plugin/starter-page-templates/class-starter-page-templates.php index 71a39db4179ee..5126ac20b35e2 100644 --- a/apps/editing-toolkit/editing-toolkit-plugin/starter-page-templates/class-starter-page-templates.php +++ b/apps/editing-toolkit/editing-toolkit-plugin/starter-page-templates/class-starter-page-templates.php @@ -36,7 +36,7 @@ private function __construct() { 'starter_page_templates', A8C_ETK_PLUGIN_VERSION, get_option( 'site_vertical', 'default' ), - $this->get_verticals_locale(), + get_locale(), ) );