Change enqueue of the script to solid style

inc/autoload/class-add-css.php

@@ -28,8 +28,7 @@ class Enqueue_Column_Style {
 	 * Init function to register all used hooks.
 	 */
 	public function __construct() {
-		add_action( 'admin_head-themes.php', array( $this, 'enqueue_style' ) );
-		add_action( 'admin_head-plugins.php', array( $this, 'enqueue_style' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ) );
 	}
 
 	/**
@@ -45,7 +44,10 @@ public static function init() {
 	/**
 	 * Enqueue column style.
 	 */
-	public function enqueue_style() {
+	public function enqueue_style( $hook ) {
+		if ( is_admin() && ! in_array( $hook, array( 'themes.php', 'plugins.php' ), true ) ) {
+			return;
+		}
 		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
 		wp_register_style(

inc/autoload/class-add-theme-list.php

@@ -100,10 +100,9 @@ public function __construct() {
 	 * Initialize the class.
 	 */
 	public static function init() {
-
 		$class = __CLASS__;
 		if ( empty( $GLOBALS[ $class ] ) ) {
-			$GLOBALS[ $class ] = new $class;
+			$GLOBALS[ $class ] = new $class();
 		}
 	}
 
@@ -113,13 +112,12 @@ public static function init() {
 	 * @since 2016-10-23
 	 */
 	public function notice_about_clear_cache() {
-
 		$class   = 'notice notice-info';
-		$message = esc_attr__(
+		$message = __(
 			'Multisite Enhancements: Theme usage information is not cached while WP_DEBUG is true.',
-		'multisite-enhancements'
+			'multisite-enhancements'
 		);
-		printf( '<div class="%1$s"><p>%2$s</p></div>', $class, $message );
+		printf( '<div class="%1$s"><p>%2$s</p></div>', $class, esc_attr( $message ) );
 	}
 
 	/**
@@ -251,13 +249,11 @@ public function manage_themes_custom_column( $column_name, $theme_key, \WP_Theme
 	 * @return array
 	 */
 	public function is_theme_active_on_blogs( $theme_key ) {
-
 		$blogs_themes = $this->get_blogs_themes();
 
 		$active_in_themes = array();
 
 		foreach ( $blogs_themes as $blog_id => $data ) {
-
 			if ( $data['stylesheet'] === $theme_key ) {
 				$active_in_themes[ $blog_id ] = array(
 					'name' => $data['blogname'],
@@ -331,7 +327,6 @@ public function get_blogs_themes() {
 	 * @return bool
 	 */
 	public function development_helper() {
-
 		if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) {
 			return false;
 		}
@@ -348,19 +343,17 @@ public function development_helper() {
 	 * @since 2015-02-21
 	 */
 	public function clear_themes_site_transient() {
-
 		delete_site_transient( self::$site_transient_blogs_themes );
 	}
 
 	/**
 	 * Check, the current theme have a parent value and is a child theme.
 	 *
-	 * @param array|\WP_Theme $theme_data An array of theme data.
+	 * @param array|WP_Theme $theme_data An array of theme data.
 	 *
 	 * @return bool
 	 */
-	public function is_child( \WP_Theme $theme_data ) {
-
+	public function is_child( WP_Theme $theme_data ) {
 		return (bool) $theme_data->parent();
 	}
 
@@ -375,7 +368,6 @@ public function is_child( \WP_Theme $theme_data ) {
 	 * @return  array
 	 */
 	public function is_parent( $theme_key ) {
-
 		$blogs_themes = $this->get_blogs_themes();
 		$parent_of    = array();
 
@@ -385,7 +377,6 @@ public function is_parent( $theme_key ) {
 		 * @var array $data
 		 */
 		foreach ( $blogs_themes as $blog_id => $data ) {
-
 			$template = false;
 			if ( array_key_exists( 'template', $data ) ) {
 				$template = $data['template'];
@@ -408,7 +399,6 @@ public function is_parent( $theme_key ) {
 	 * @return bool
 	 */
 	public function is_archived( $site_id ) {
-
 		$site_id = (int) $site_id;
 
 		return (bool) get_blog_details( $site_id )->archived;

inc/autoload/class-admin-bar-tweaks.php

@@ -18,10 +18,9 @@ class Multisite_Admin_Bar_Tweaks {
 	 * Initialize this class.
 	 */
 	public static function init() {
-
 		$class = __CLASS__;
 		if ( empty( $GLOBALS[ $class ] ) ) {
-			$GLOBALS[ $class ] = new $class;
+			$GLOBALS[ $class ] = new $class();
 		}
 	}
 
@@ -31,7 +30,6 @@ public static function init() {
 	 * @since   0.0.1
 	 */
 	public function __construct() {
-
 		add_action( 'wp_before_admin_bar_render', array( $this, 'enhance_network_admin_bar' ) );
 		add_action( 'wp_before_admin_bar_render', array( $this, 'enhance_network_blog_admin_bar' ) );
 	}
@@ -42,7 +40,6 @@ public function __construct() {
 	 * @since   0.0.1
 	 */
 	public function enhance_network_admin_bar() {
-
 		global $wp_admin_bar;
 
 		// Show only when the user has at least one site, or they're a super admin.
@@ -95,13 +92,11 @@ public function enhance_network_blog_admin_bar() {
 		}
 
 		foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-
 			switch_to_blog( $blog->userblog_id );
 
 			$menu_id = 'blog-' . $blog->userblog_id;
 
 			if ( current_user_can( 'edit_posts' ) ) {
-
 				$wp_admin_bar->remove_node( $menu_id . '-c' );
 
 				$awaiting_mod = wp_count_comments();

inc/autoload/class-change-footer-text.php

@@ -47,10 +47,9 @@ class Multisite_Change_Footer_Text {
 	 * Initialize the class.
 	 */
 	public static function init() {
-
 		$class = __CLASS__;
 		if ( empty( $GLOBALS[ $class ] ) ) {
-			$GLOBALS[ $class ] = new $class;
+			$GLOBALS[ $class ] = new $class();
 		}
 	}