Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch notices earlier than priority 10 (https://github.com/woocommerce/woocommerce-admin/pull/2981)

This commit is contained in:
Justin Shreve 2019-10-02 09:25:31 -04:00 committed by GitHub
parent edcfc161fa
commit 9a48461921
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-admin/phpcs.xml.dist
View File

@ -12,7 +12,7 @@
<!-- Configs -->
<config name="minimum_supported_wp_version" value="4.7" />
<config name="testVersion" value="5.4-"/>
<config name="testVersion" value="5.6-"/>
<!-- Rules -->
<rule ref="WooCommerce-Core" />

28
plugins/woocommerce-admin/src/Loader.php
View File

@ -50,12 +50,12 @@ class Loader {
public function __construct() {
add_action( 'init', array( __CLASS__, 'define_tables' ) );
add_action( 'init', array( __CLASS__, 'load_features' ) );
; add_action( 'admin_enqueue_scripts', array( __CLASS__, 'register_scripts' ) );
add_action( 'admin_enqueue_scripts', array( __CLASS__, 'register_scripts' ) );
add_action( 'admin_enqueue_scripts', array( __CLASS__, 'inject_wc_settings_dependencies' ), 14 );
add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_scripts' ), 15 );
// old settings injection
// Old settings injection.
add_filter( 'woocommerce_components_settings', array( __CLASS__, 'add_component_settings' ) );
// new settings injection
// New settings injection.
add_filter( 'woocommerce_shared_settings', array( __CLASS__, 'add_component_settings' ) );
add_filter( 'admin_body_class', array( __CLASS__, 'add_admin_body_classes' ) );
add_action( 'admin_menu', array( __CLASS__, 'register_page_handler' ) );
@ -65,7 +65,7 @@ class Loader {
add_filter( 'woocommerce_settings_groups', array( __CLASS__, 'add_settings_group' ) );
add_filter( 'woocommerce_settings-wc_admin', array( __CLASS__, 'add_settings' ) );
add_action( 'admin_head', array( __CLASS__, 'remove_notices' ) );
add_action( 'admin_notices', array( __CLASS__, 'inject_before_notices' ) );
add_action( 'admin_notices', array( __CLASS__, 'inject_before_notices' ), -9999 );
add_action( 'admin_notices', array( __CLASS__, 'inject_after_notices' ), PHP_INT_MAX );
// priority is 20 to run after https://github.com/woocommerce/woocommerce/blob/a55ae325306fc2179149ba9b97e66f32f84fdd9c/includes/admin/class-wc-admin-menus.php#L165.
@ -159,7 +159,7 @@ class Loader {
$feature = 'Automattic\\WooCommerce\\Admin\\Features\\' . $feature;
if ( class_exists( $feature ) ) {
new $feature;
new $feature();
}
}
}
@ -316,7 +316,7 @@ class Loader {
WC_ADMIN_APP,
self::get_url( 'app/style.css' ),
array( 'wc-components' ),
self::get_file_version('app/style.css' )
self::get_file_version( 'app/style.css' )
);
wp_style_add_data( WC_ADMIN_APP, 'rtl', 'replace' );
@ -540,22 +540,22 @@ class Loader {
if ( ! is_admin() ) {
return $settings;
}
if ( ! function_exists( 'wc_blocks_container' ) ) {
global $wp_locale;
// inject data not available via older versions of wc_blocks/woo.
$settings['orderStatuses'] = self::get_order_statuses( wc_get_order_statuses() );
$settings['currency'] = self::get_currency_settings();
$settings['locale'] = [
'siteLocale' => isset( $settings['siteLocale'] )
$settings['orderStatuses'] = self::get_order_statuses( wc_get_order_statuses() );
$settings['currency'] = self::get_currency_settings();
$settings['locale'] = [
'siteLocale' => isset( $settings['siteLocale'] )
? $settings['siteLocale']
: get_locale(),
'userLocale' => isset( $settings['l10n']['userLocale'] )
'userLocale' => isset( $settings['l10n']['userLocale'] )
? $settings['l10n']['userLocale']
: get_user_locale(),
'weekdaysShort' => isset( $settings['l10n']['weekdaysShort'] )
? $settings['l10n']['weekdaysShort']
: array_values( $wp_locale->weekday_abbrev )
: array_values( $wp_locale->weekday_abbrev ),
];
}
@ -790,7 +790,7 @@ class Loader {
'wc-date',
'wc-components',
];
foreach( $handles_for_injection as $handle ) {
foreach ( $handles_for_injection as $handle ) {
$script = wp_scripts()->query( $handle, 'registered' );
if ( $script instanceof _WP_Dependency ) {
$script->deps[] = 'wc-settings';