From 87e372299d3efdbeaa07e867be6886ebedc7e0af Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Wed, 25 Mar 2015 01:42:25 +0000
Subject: [PATCH] Emoji: Revert [31877], and print the emoji shim and styles
 during `admin_print_scripts` and `admin_print_styles`, instead. This is a few
 milliseconds slower, but easier to reuse in Press This, and any other code
 that uses admin scripts and styles, without using `admin-header.php`.

See #31701.



git-svn-id: https://develop.svn.wordpress.org/trunk@31879 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/admin-header.php       | 3 ---
 src/wp-includes/default-filters.php | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index d0f3be6d7a..59b8f121cd 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -50,9 +50,6 @@ _wp_admin_html_begin();
 <title><?php echo $admin_title; ?></title>
 <?php
 
-print_emoji_detection_script();
-print_emoji_styles();
-
 wp_enqueue_style( 'colors' );
 wp_enqueue_style( 'ie' );
 wp_enqueue_script('utils');
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
index 449d971cb8..ad0f47b69a 100644
--- a/src/wp-includes/default-filters.php
+++ b/src/wp-includes/default-filters.php
@@ -252,8 +252,10 @@ add_action( 'do_pings',                   'do_all_pings',
 add_action( 'do_robots',                  'do_robots'                                      );
 add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
 add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
+add_action( 'admin_print_scripts',        'print_emoji_detection_script'                   );
 add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
 add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
+add_action( 'admin_print_styles',         'print_emoji_styles'                             );
 add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
 add_action( 'init',                       'smilies_init',                             5    );
 add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );