Changeset 38355 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

08/25/2016 07:08:38 PM (9 years ago)

Author:

wonderboymusic

Message:

Site Icon: There is no good reason for class-wp-site-icon.php to drop a global instance of itself whenever the file is loaded. The lone use of the global instance of WP_Site_Icon is in an AJAX action that provides virtually no way to override - the file is loaded immediately before the global is used.

Let us remove the $wp_site_icon global. I will fall on the sword if this comes back to bite us (waiting with bated breath).

See #37699.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3163 +3163 @@
  *
  * @since 4.3.0
- *
- * @global WP_Site_Icon $wp_site_icon
  */
 function wp_ajax_crop_image() {
@@ -3185 +3183 @@
         case 'site-icon':
             require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
-            global $wp_site_icon;
+            $wp_site_icon = new WP_Site_Icon();
 
             // Skip creating a new attachment if the attachment is a Site Icon.