Changeset 31879

Timestamp:

03/25/2015 01:42:25 AM (10 years ago)

Author:

pento

Message:

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.

Location:

trunk/src

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)

trunk/src/wp-admin/admin-header.php

@@ -50 +50 @@
 <title><?php echo $admin_title; ?></title>
 <?php
-
-print_emoji_detection_script();
-print_emoji_styles();
 
 wp_enqueue_style( 'colors' );

trunk/src/wp-includes/default-filters.php

@@ -253 +253 @@
 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    );