make use of passed hook for admin_enqueue_scripts to avoid needing get_current_screen (#992)

Author: tw2113

inc/about.php

@@ -21,10 +21,9 @@
  *
  * @since 1.6.0
  */
-function cptui_about_assets() {
-	$current_screen = get_current_screen();
+function cptui_about_assets( $hook ) {
 
-	if ( ! is_object( $current_screen ) || 'toplevel_page_cptui_main_menu' !== $current_screen->base ) {
+	if ( 'toplevel_page_cptui_main_menu' !== $hook ) {
 		return;
 	}
 

inc/listings.php

@@ -21,10 +21,9 @@
  *
  * @since 1.6.0
  */
-function cptui_listings_assets() {
-	$current_screen = get_current_screen();
+function cptui_listings_assets( $hook ) {
 
-	if ( ! is_object( $current_screen ) || 'cpt-ui_page_cptui_listings' !== $current_screen->base ) {
+	if ( 'cpt-ui_page_cptui_listings' !== $hook ) {
 		return;
 	}
 

inc/post-types.php

@@ -23,11 +23,9 @@
  *
  * @internal
  */
-function cptui_post_type_enqueue_scripts() {
+function cptui_post_type_enqueue_scripts( $hook ) {
 
-	$current_screen = get_current_screen();
-
-	if ( ! is_object( $current_screen ) || 'cpt-ui_page_cptui_manage_post_types' !== $current_screen->base ) {
+	if ( 'cpt-ui_page_cptui_manage_post_types' !== $hook ) {
 		return;
 	}
 

inc/support.php

@@ -23,11 +23,9 @@
  *
  * @internal
  */
-function cptui_support_enqueue_scripts() {
+function cptui_support_enqueue_scripts( $hook ) {
 
-	$current_screen = get_current_screen();
-
-	if ( ! is_object( $current_screen ) || 'cpt-ui_page_cptui_support' !== $current_screen->base ) {
+	if ( 'cpt-ui_page_cptui_support' !== $hook ) {
 		return;
 	}
 

inc/taxonomies.php

@@ -23,11 +23,9 @@
  *
  * @internal
  */
-function cptui_taxonomies_enqueue_scripts() {
+function cptui_taxonomies_enqueue_scripts( $hook ) {
 
-	$current_screen = get_current_screen();
-
-	if ( ! is_object( $current_screen ) || 'cpt-ui_page_cptui_manage_taxonomies' !== $current_screen->base ) {
+	if ( 'cpt-ui_page_cptui_manage_taxonomies' !== $hook ) {
 		return;
 	}
 

inc/tools.php

@@ -23,10 +23,9 @@
  *
  * @return void
  */
-function cptui_tools_assets() {
-	$current_screen = get_current_screen();
+function cptui_tools_assets( $hook ) {
 
-	if ( ! is_object( $current_screen ) || 'cpt-ui_page_cptui_tools' !== $current_screen->base ) {
+	if ( 'cpt-ui_page_cptui_tools' !== $hook ) {
 		return;
 	}
 

inc/utility.php

@@ -431,21 +431,15 @@ function cptui_newsletter_form() {
  * @author Scott Anderson <[email protected]>
  * @since  1.7.3
  */
-function enqueue_email_octopus_assets() {
-
-	$current_screen = get_current_screen();
-
-	if ( ! is_object( $current_screen ) ) {
-		return;
-	}
+function enqueue_email_octopus_assets( $hook ) {
 
 	$screens = [
 		'toplevel_page_cptui_main_menu',
 		'cpt-ui_page_cptui_manage_post_types',
 		'cpt-ui_page_cptui_manage_taxonomies',
 	];
 
-	if ( ! in_array( $current_screen->base, $screens, true ) ) {
+	if ( ! in_array( $hook, $screens, true ) ) {
 		return;
 	}