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

Merge pull request #16054 from woocommerce/fix/16043 

Fix styling and connect button in non-english languages
This commit is contained in:
Mike Jolley 2017-07-11 10:49:09 +01:00 committed by GitHub
parent be4a3fc99a e432d2d0ad
commit 5c32abfe6b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/admin/helper/class-wc-helper.php
View File

@ -315,9 +315,11 @@ class WC_Helper {
* Enqueue admin scripts and styles.
*/
public static function admin_enqueue_scripts() {
$screen = get_current_screen();
$screen = get_current_screen();
$screen_id = $screen ? $screen->id : '';
$wc_screen_id = sanitize_title( __( 'WooCommerce', 'woocommerce' ) );
if ( 'woocommerce_page_wc-addons' == $screen->id && isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
if ( $wc_screen_id . '_page_wc-addons' === $screen_id && isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
wp_enqueue_style( 'woocommerce-helper', WC()->plugin_url() . '/assets/css/helper.css', array(), WC_VERSION );
}
}
@ -441,7 +443,9 @@ class WC_Helper {
* Various early-phase actions with possible redirects.
*/
public static function current_screen( $screen ) {
if ( 'woocommerce_page_wc-addons' != $screen->id ) {
$wc_screen_id = sanitize_title( __( 'WooCommerce', 'woocommerce' ) );
if ( $wc_screen_id . '_page_wc-addons' !== $screen->id ) {
return;
}
@ -1082,8 +1086,10 @@ class WC_Helper {
* Add a note about available extension updates if Woo core has an update available.
*/
public static function admin_notices() {
$screen = get_current_screen();
if ( 'update-core' !== $screen->id ) {
$screen = get_current_screen();
$screen_id = $screen ? $screen->id : '';
if ( 'update-core' !== $screen_id ) {
return;
}