Changeset 38355

Timestamp:

08/25/2016 07:08:38 PM (8 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.

Location:

trunk

Files:

• src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-site-icon.php (modified) (1 diff)
• tests/phpunit/tests/general/template.php (modified) (2 diffs)
• tests/phpunit/tests/image/site_icon.php (modified) (3 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.

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

@@ -241 +241 @@
     }
 }
-
-/**
- * @global WP_Site_Icon $wp_site_icon
- */
-$GLOBALS['wp_site_icon'] = new WP_Site_Icon;

trunk/tests/phpunit/tests/general/template.php

@@ -1 +1 @@
 <?php
-
 /**
  * A set of unit tests for functions in wp-includes/general-template.php
  *
  * @group template
+ * @group site_icon
  */
+
+require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
+
 class Tests_General_Template extends WP_UnitTestCase {
-
-    public $wp_site_icon;
+    protected $wp_site_icon;
     public $site_icon_id;
     public $site_icon_url;
@@ -18 +20 @@
         parent::setUp();
 
-        require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
-        $this->wp_site_icon = $GLOBALS['wp_site_icon'];
+        $this->wp_site_icon = new WP_Site_Icon();
     }
 

trunk/tests/phpunit/tests/image/site_icon.php

@@ -1 +1 @@
 <?php
-
 /**
  * Tests for the WP_Site_Icon class.
@@ -6 +5 @@
  * @group site_icon
  */
+
+require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
+
 class Tests_WP_Site_Icon extends WP_UnitTestCase {
-    public $wp_site_icon;
+    protected $wp_site_icon;
+
     public $attachment_id = 0;
 
@@ -13 +16 @@
         parent::setUp();
 
-        require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
-        $this->wp_site_icon = $GLOBALS['wp_site_icon'];
+        $this->wp_site_icon = new WP_Site_Icon();
     }
 
     function tearDown() {
-        $this->site_icon = null;
+        $this->_remove_custom_logo();
         $this->remove_added_uploads();
         parent::tearDown();
+    }
+
+    function _remove_custom_logo() {
+        remove_theme_mod( 'custom_logo' );
     }