From 7718755e2e0b93773c351237cc6258d9a1cf37fb Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Tue, 30 Jun 2015 23:25:46 +0000 Subject: [PATCH] Site Icon: Move admin icon filter to its rightful place. The action is unrelated to `WP_Site_Icon` itself. Props kraftbj. See #16434. git-svn-id: https://develop.svn.wordpress.org/trunk@33011 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/admin-filters.php | 1 + src/wp-admin/includes/class-wp-site-icon.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php index 68e587dd8d..ff9204f125 100644 --- a/src/wp-admin/includes/admin-filters.php +++ b/src/wp-admin/includes/admin-filters.php @@ -47,6 +47,7 @@ add_filter( 'media_upload_tabs', 'update_gallery_tab' ); // 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' ); diff --git a/src/wp-admin/includes/class-wp-site-icon.php b/src/wp-admin/includes/class-wp-site-icon.php index d97ba6d63b..a4a08e0d51 100644 --- a/src/wp-admin/includes/class-wp-site-icon.php +++ b/src/wp-admin/includes/class-wp-site-icon.php @@ -58,8 +58,6 @@ class WP_Site_Icon { 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' ) );