From 38e4211efb8a802d19e564292095ad7319d8231b Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Tue, 30 Jun 2015 14:37:27 +0000
Subject: [PATCH] Use existing nomenclature pattern for Site Icon class.

Props kraftbj.
Fixes #32834.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/admin.php                                 | 2 +-
 wp-admin/includes/{site-icon.php => class-wp-site-icon.php} | 3 +++
 wp-includes/version.php                                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename wp-admin/includes/{site-icon.php => class-wp-site-icon.php} (99%)

diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php
index cee0a207bc..64a0ded744 100644
--- a/wp-admin/includes/admin.php
+++ b/wp-admin/includes/admin.php
@@ -65,7 +65,7 @@ require_once(ABSPATH . 'wp-admin/includes/theme.php');
 require_once(ABSPATH . 'wp-admin/includes/user.php');
 
 /** WordPress Site Icon API */
-require_once(ABSPATH . 'wp-admin/includes/site-icon.php');
+require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
 
 /** WordPress Update Administration API */
 require_once(ABSPATH . 'wp-admin/includes/update.php');
diff --git a/wp-admin/includes/site-icon.php b/wp-admin/includes/class-wp-site-icon.php
similarity index 99%
rename from wp-admin/includes/site-icon.php
rename to wp-admin/includes/class-wp-site-icon.php
index 8255b4debf..d97ba6d63b 100644
--- a/wp-admin/includes/site-icon.php
+++ b/wp-admin/includes/class-wp-site-icon.php
@@ -633,4 +633,7 @@ class WP_Site_Icon {
 	}
 }
 
+/**
+ * @global WP_Site_Icon $wp_site_icon
+ */
 $GLOBALS['wp_site_icon'] = new WP_Site_Icon;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b679a4804e..c06282e012 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-33000';
+$wp_version = '4.3-alpha-33001';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.