Masterbar: allow logging out of wpcom when logging out of site. (#12457)

Fixes #12456

This change avoids initialiazing all of the Masterbar after admin_bar_init. We want the module to be available after logging out as well, so the function hooked into wp_logout can be triggered.

modules/masterbar.php

@@ -13,14 +13,4 @@
 
 require dirname( __FILE__ ) . '/masterbar/masterbar.php';
 
-// In order to be able to tell if it's an AMP request or not we have to hook into parse_query at a later priority.
-add_action( 'admin_bar_init', 'jetpack_initialize_masterbar', 99 );
-
-/**
- * Initializes the Masterbar in case the request is not AMP.
- */
-function jetpack_initialize_masterbar() {
-	if ( ! Jetpack_AMP_Support::is_amp_request() ) {
-		new A8C_WPCOM_Masterbar();
-	}
-}
+new A8C_WPCOM_Masterbar();

modules/masterbar/masterbar.php

@@ -74,6 +74,16 @@ class A8C_WPCOM_Masterbar {
 	 * Constructor
 	 */
 	public function __construct() {
+		add_action( 'admin_bar_init', array( $this, 'init' ) );
+
+		// Post logout on the site, also log the user out of WordPress.com.
+		add_action( 'wp_logout', array( $this, 'maybe_logout_user_from_wpcom' ) );
+	}
+
+	/**
+	 * Initialize our masterbar.
+	 */
+	public function init() {
 		$this->locale  = $this->get_locale();
 		$this->user_id = get_current_user_id();
 
@@ -88,6 +98,14 @@ public function __construct() {
 			return;
 		}
 
+		// Disable the Masterbar on AMP views.
+		if (
+			class_exists( 'Jetpack_AMP_Support' )
+			&& Jetpack_AMP_Support::is_amp_request()
+		) {
+			return;
+		}
+
 		Jetpack::dns_prefetch(
 			array(
 				'//s0.wp.com',
@@ -141,8 +159,6 @@ public function __construct() {
 			// Override Notification module to include RTL styles.
 			add_action( 'a8c_wpcom_masterbar_enqueue_rtl_notification_styles', '__return_true' );
 		}
-
-		add_action( 'wp_logout', array( $this, 'maybe_logout_user_from_wpcom' ) );
 	}
 
 	/**