Changeset 8008

Timestamp:

05/28/2008 10:15:46 PM (18 years ago)

Author:

ryan

Message:

styles should come before scripts should come before head. Props mdawaffe

File:

• trunk/wp-admin/admin-header.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -46 +46 @@
 <?php endif;
 
-if ( isset($page_hook) ) {
-    do_action('admin_print_styles-' . $page_hook);
-    do_action('admin_print_scripts-' . $page_hook);
-    do_action('admin_head-' . $page_hook);
-} else if ( isset($plugin_page) ) {
-    do_action('admin_print_styles-' . $plugin_page);
-    do_action('admin_print_scripts-' . $plugin_page);
-    do_action('admin_head-' . $plugin_page);
-} else if ( isset($pagenow) ) {
-    do_action('admin_print_styles-' . $pagenow);
-    do_action('admin_print_scripts-' . $pagenow);
-    do_action('admin_head-' . $pagenow);
-}
-do_action('admin_print_styles');
-do_action('admin_print_scripts');
-do_action('admin_head');
+$hook_suffixes = array();
+
+if ( isset($page_hook) )
+    $hook_suffixes[] = "-$page_hook";
+else if ( isset($plugin_page) )
+    $hook_suffixes[] = "-$plugin_page";
+else if ( isset($pagenow) )
+    $hook_suffixes[] = "-$pagenow";
+
+$hook_suffixes[] = '';
+
+foreach ( $hook_suffixes as $hook_suffix )
+    do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' );
+foreach ( $hook_suffixes as $hook_suffix )
+    do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' );
+foreach ( $hook_suffixes as $hook_suffix )
+    do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' );
+unset($hook_suffixes, $hook_suffix);
 
 ?>