Ticket #16434: 16434.10.diff

src/wp-admin/includes/admin-filters.php

@@ -47 +47 @@
 // Misc hooks.
 add_action( 'admin_head', 'wp_admin_canonical_url'   );
 add_action( 'admin_head', 'wp_color_scheme_settings' );
+add_action( 'admin_head', 'wp_site_icon'             );
 add_action( 'admin_head', '_ipad_meta'               );
 
 add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );

src/wp-admin/includes/site-icon.php

@@ -58 +58 @@
         public function __construct() {
 
                 // Add the favicon to the backend.
-                add_action( 'admin_head', 'wp_site_icon' );
-
                 add_action( 'admin_menu', array( $this, 'admin_menu_upload_site_icon' ) );
 
                 add_action( 'admin_action_set_site_icon',    array( $this, 'set_site_icon'    ) );