← All changes
|
jetpack_vendor/automattic/jetpack-masterbar/src/class-main.php
+13
-11
13.7.2
→
16.3-beta
View file →
| @@ -13,9 +13,9 @@ | ||
| 13 | 13 | * Main class for the Masterbar package. |
| 14 | 14 | */ |
| 15 | 15 | class Main { |
| 16 | 16 | |
| 17 | - const PACKAGE_VERSION = '0.6.0'; | |
| 17 | + const PACKAGE_VERSION = '0.29.2'; | |
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * Initializer. |
| 21 | 21 | * Used to configure the Masterbar package. |
| @@ -28,23 +28,25 @@ | ||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | new Admin_Color_Schemes(); |
| 31 | 31 | |
| 32 | - if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { | |
| 32 | + remove_filter( 'pre_option_wpcom_admin_interface', 'wpcom_admin_interface_pre_get_option' ); | |
| 33 | + $is_wp_admin_interface = get_option( 'wpcom_admin_interface' ) === 'wp-admin'; | |
| 34 | + if ( function_exists( 'wpcom_admin_interface_pre_get_option' ) ) { | |
| 35 | + add_filter( 'pre_option_wpcom_admin_interface', 'wpcom_admin_interface_pre_get_option', 10 ); | |
| 36 | + } | |
| 37 | + | |
| 38 | + // Show Additional CSS nudges on both Simple and Atomic, independently of the admin interface. | |
| 39 | + require_once __DIR__ . '/nudges/bootstrap.php'; | |
| 40 | + | |
| 41 | + if ( $is_wp_admin_interface ) { | |
| 33 | 42 | return; |
| 34 | 43 | } |
| 35 | 44 | |
| 36 | 45 | $host = new Host(); |
| 37 | 46 | |
| 38 | - if ( ! $host->is_wpcom_simple() && ! ( defined( 'WPCOM_ADMIN_BAR_UNIFICATION' ) && WPCOM_ADMIN_BAR_UNIFICATION ) ) { | |
| 39 | - new Masterbar(); | |
| 40 | - } | |
| 41 | - | |
| 42 | - if ( $host->is_wpcom_platform() ) { | |
| 43 | - new Inline_Help(); | |
| 44 | - require_once __DIR__ . '/wp-posts-list/bootstrap.php'; | |
| 45 | - require_once __DIR__ . '/nudges/bootstrap.php'; | |
| 46 | - } | |
| 47 | + new Inline_Help(); | |
| 48 | + require_once __DIR__ . '/wp-posts-list/bootstrap.php'; | |
| 47 | 49 | |
| 48 | 50 | if ( $host->is_woa_site() ) { |
| 49 | 51 | require_once __DIR__ . '/profile-edit/bootstrap.php'; |
| 50 | 52 | } |