From f3511b048c59ea957e840169e3664e171de1f3e4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 28 May 2008 22:15:46 +0000
Subject: [PATCH] styles should come before scripts should come before head.
 Props mdawaffe

git-svn-id: http://svn.automattic.com/wordpress/trunk@8008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 3f6aaa27ce..61dae26448 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -45,22 +45,24 @@ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document
 <style type="text/css">* html { overflow-x: hidden; }</style>
 <?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);
 
 ?>
 </head>