Changeset 35572

Timestamp:

11/08/2015 02:03:34 AM (10 years ago)

Author:

jeremyfelt

Message:

Site Icon: Wrap site icon retrieval with switch_to_blog() as needed.

When the site icon for another site is requested, retrieving its ID via get_blog_option() is not enough. switch_to_blog() is used to set proper context when required.

Adds multsite tests for has_site_icon().

Props imath.
Fixes #34312.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/template.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -759 +759 @@
  */
 function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-    if ( $blog_id && is_multisite() ) {
-        $site_icon_id = get_blog_option( $blog_id, 'site_icon' );
-    } else {
-        $site_icon_id = get_option( 'site_icon' );
-    }
+    if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
+        switch_to_blog( $blog_id );
+    }
+
+    $site_icon_id = get_option( 'site_icon' );
 
     if ( $site_icon_id ) {
@@ -772 +772 @@
         }
         $url = wp_get_attachment_image_url( $site_icon_id, $size_data );
+    }
+
+    if ( is_multisite() && ms_is_switched() ) {
+        restore_current_blog();
     }
 

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

@@ -56 +56 @@
         $this->_remove_site_icon();
         $this->assertFalse( has_site_icon() );
+    }
+
+    /**
+     * @group site_icon
+     * @group multisite
+     */
+    function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test requires multisite.' );
+        }
+
+        $blog_id = $this->factory->blog->create();
+        switch_to_blog( $blog_id );
+        $this->_set_site_icon();
+        restore_current_blog();
+
+        $this->assertTrue( has_site_icon( $blog_id ) );
+    }
+
+    /**
+     * @group site_icon
+     * @group multisite
+     */
+    function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test requires multisite.' );
+        }
+
+        $blog_id = $this->factory->blog->create();
+
+        $this->assertFalse( has_site_icon( $blog_id ) );
     }