From f18fabc3001b777afe6a58628b6f252e3a50ce1f Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Tue, 30 Jun 2015 23:26:25 +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.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/admin-filters.php      | 1 +
 wp-admin/includes/class-wp-site-icon.php | 2 --
 wp-includes/version.php                  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php
index 68e587dd8d..ff9204f125 100644
--- a/wp-admin/includes/admin-filters.php
+++ b/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/wp-admin/includes/class-wp-site-icon.php b/wp-admin/includes/class-wp-site-icon.php
index d97ba6d63b..a4a08e0d51 100644
--- a/wp-admin/includes/class-wp-site-icon.php
+++ b/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'    ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2079d5e47e..873caf67c9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-33010';
+$wp_version = '4.3-alpha-33011';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.