diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php index 38286faeef5..333caf9a613 100644 --- a/includes/admin/class-wc-admin-notices.php +++ b/includes/admin/class-wc-admin-notices.php @@ -57,7 +57,7 @@ class WC_Admin_Notices { if ( in_array( 'theme_support', $notices ) && ! current_theme_supports( 'woocommerce' ) ) { $template = get_option( 'template' ); - if ( ! in_array( $template, array( 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' ) ) ) { + if ( ! in_array( $template, wc_get_core_supported_themes() ) ) { wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/activation.css', WC_PLUGIN_FILE ) ); add_action( 'admin_notices', array( $this, 'theme_check_notice' ) ); } diff --git a/includes/admin/views/html-admin-page-status-report.php b/includes/admin/views/html-admin-page-status-report.php index 3b97f6eb18b..0eda0bd44ab 100644 --- a/includes/admin/views/html-admin-page-status-report.php +++ b/includes/admin/views/html-admin-page-status-report.php @@ -438,7 +438,7 @@ : template, array( 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' ) ) ) { + if ( ! current_theme_supports( 'woocommerce' ) && ! in_array( $active_theme->template, wc_get_core_supported_themes() ) ) { echo '' . __( 'Not Declared', 'woocommerce' ) . ''; } else { echo '' . __( 'Yes', 'woocommerce' ) . ''; diff --git a/includes/wc-core-functions.php b/includes/wc-core-functions.php index ee298b43e30..b9efba20e87 100644 --- a/includes/wc-core-functions.php +++ b/includes/wc-core-functions.php @@ -602,3 +602,13 @@ function wc_remove_order_notes_from_wp_count_comments( $stats, $post_id ) { } add_filter( 'wp_count_comments', 'wc_remove_order_notes_from_wp_count_comments', 10, 2 ); + +/** + * WooCommerce Core Supported Themes + * + * @since 2.2 + * @return array + */ +function wc_get_core_supported_themes() { + return array( 'twentyfourteen', 'twentythirteen', 'twentyeleven', 'twentytwelve', 'twentyten' ); +}