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.


Built from https://develop.svn.wordpress.org/trunk@31879


git-svn-id: http://core.svn.wordpress.org/trunk@31858 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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');

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    );

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta2-31878';
+$wp_version = '4.2-beta2-31879';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.