diff --git a/projects/packages/stats-admin/changelog/fix-blaze-badge-stats-page b/projects/packages/stats-admin/changelog/fix-blaze-badge-stats-page new file mode 100644 index 0000000000000..d49e5c5324388 --- /dev/null +++ b/projects/packages/stats-admin/changelog/fix-blaze-badge-stats-page @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Hides the Blaze badge when the feature is disabled + + diff --git a/projects/packages/stats-admin/composer.json b/projects/packages/stats-admin/composer.json index 269914573a142..bfa1efe864708 100644 --- a/projects/packages/stats-admin/composer.json +++ b/projects/packages/stats-admin/composer.json @@ -6,6 +6,7 @@ "require": { "php": ">=7.2", "automattic/jetpack-connection": "@dev", + "automattic/jetpack-blaze": "@dev", "automattic/jetpack-constants": "@dev", "automattic/jetpack-plans": "@dev", "automattic/jetpack-stats": "@dev", diff --git a/projects/packages/stats-admin/src/class-odyssey-config-data.php b/projects/packages/stats-admin/src/class-odyssey-config-data.php index a828f04ab5930..87492e7096632 100644 --- a/projects/packages/stats-admin/src/class-odyssey-config-data.php +++ b/projects/packages/stats-admin/src/class-odyssey-config-data.php @@ -7,6 +7,7 @@ namespace Automattic\Jetpack\Stats_Admin; +use Automattic\Jetpack\Blaze; use Automattic\Jetpack\Current_Plan as Jetpack_Plan; use Automattic\Jetpack\Modules; use Automattic\Jetpack\Status\Host; @@ -40,6 +41,8 @@ public function get_data() { $blog_id = Jetpack_Options::get_option( 'id' ); $host = new Host(); + $can_blaze = class_exists( 'Automattic\Jetpack\Blaze' ) && Blaze::should_initialize()['can_init']; + return array( 'admin_page_base' => $this->get_admin_path(), 'api_root' => esc_url_raw( rest_url() ), @@ -96,6 +99,7 @@ public function get_data() { 'jetpack_version' => defined( 'JETPACK__VERSION' ) ? JETPACK__VERSION : '', 'stats_admin_version' => Main::VERSION, 'software_version' => $wp_version, + 'can_blaze' => $can_blaze, ), ), ), diff --git a/projects/plugins/jetpack/changelog/fix-blaze-badge-stats-page b/projects/plugins/jetpack/changelog/fix-blaze-badge-stats-page new file mode 100644 index 0000000000000..1b4d872d2ab26 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-blaze-badge-stats-page @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Update composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index f5150eb09fa57..4a1c8c8b7433a 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -2704,9 +2704,10 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "ba5965287a795a75d5f05b923bdc478d9d71743a" + "reference": "d6c733cb5102f8189dcaa1d9b77e5b34403fa32e" }, "require": { + "automattic/jetpack-blaze": "@dev", "automattic/jetpack-connection": "@dev", "automattic/jetpack-constants": "@dev", "automattic/jetpack-jitm": "@dev", diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-blaze-badge-stats-page b/projects/plugins/mu-wpcom-plugin/changelog/fix-blaze-badge-stats-page new file mode 100644 index 0000000000000..47f5577b92146 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-blaze-badge-stats-page @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Update composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index c1194907c3ea4..24d02eb02fac1 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -1473,9 +1473,10 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "ba5965287a795a75d5f05b923bdc478d9d71743a" + "reference": "d6c733cb5102f8189dcaa1d9b77e5b34403fa32e" }, "require": { + "automattic/jetpack-blaze": "@dev", "automattic/jetpack-connection": "@dev", "automattic/jetpack-constants": "@dev", "automattic/jetpack-jitm": "@dev", diff --git a/projects/plugins/wpcomsh/changelog/fix-blaze-badge-stats-page b/projects/plugins/wpcomsh/changelog/fix-blaze-badge-stats-page new file mode 100644 index 0000000000000..47f5577b92146 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/fix-blaze-badge-stats-page @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Update composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 77ebb8be78c1c..4ca4c1fc4e56e 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -1681,9 +1681,10 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "ba5965287a795a75d5f05b923bdc478d9d71743a" + "reference": "d6c733cb5102f8189dcaa1d9b77e5b34403fa32e" }, "require": { + "automattic/jetpack-blaze": "@dev", "automattic/jetpack-connection": "@dev", "automattic/jetpack-constants": "@dev", "automattic/jetpack-jitm": "@dev",