Ticket #38253: 38253.diff

src/wp-includes/general-template.php

@@ -783 +783 @@
  * @return string Site Icon URL.
  */
 function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-        if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
+        $switched_blog = false;
+
+        if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
                 switch_to_blog( $blog_id );
+                $switched_blog = true;
         }
 
         $site_icon_id = get_option( 'site_icon' );
@@ -798 +801 @@
                 $url = wp_get_attachment_image_url( $site_icon_id, $size_data );
         }
 
-        if ( is_multisite() && ms_is_switched() ) {
+        if ( $switched_blog ) {
                 restore_current_blog();
         }
 
@@ -848 +851 @@
  * @return bool Whether the site has a custom logo or not.
  */
 function has_custom_logo( $blog_id = 0 ) {
-        if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
+        $switched_blog = false;
+
+        if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
                 switch_to_blog( $blog_id );
+                $switched_blog = true;
         }
 
         $custom_logo_id = get_theme_mod( 'custom_logo' );
 
-        if ( is_multisite() && ms_is_switched() ) {
+        if ( $switched_blog ) {
                 restore_current_blog();
         }
 
@@ -871 +877 @@
  */
 function get_custom_logo( $blog_id = 0 ) {
         $html = '';
+        $switched_blog = false;
 
-        if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
+        if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
                 switch_to_blog( $blog_id );
+                $switched_blog = true;
         }
 
         $custom_logo_id = get_theme_mod( 'custom_logo' );
@@ -896 +904 @@
                 );
         }
 
-        if ( is_multisite() && ms_is_switched() ) {
+        if ( $switched_blog ) {
                 restore_current_blog();
         }
 

tests/phpunit/tests/general/template.php

@@ -488 +488 @@
                 $actual = get_the_modified_time( $d, $post_id );
                 $this->assertEquals( $expected, $actual );
         }
+
+        /**
+         * @ticket 38253
+         */
+        function test_get_site_icon_url_preserves_switched_state() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( 'This test requires multisite.' );
+                }
+
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
+                $expected = $GLOBALS['_wp_switched_stack'];
+
+                get_site_icon_url( 512, '', $blog_id );
+
+                $result = $GLOBALS['_wp_switched_stack'];
+
+                restore_current_blog();
+
+                $this->assertSame( $expected, $result );
+        }
+
+        /**
+         * @ticket 38253
+         */
+        function test_has_custom_logo_preserves_switched_state() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( 'This test requires multisite.' );
+                }
+
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
+                $expected = $GLOBALS['_wp_switched_stack'];
+
+                has_custom_logo( $blog_id );
+
+                $result = $GLOBALS['_wp_switched_stack'];
+
+                restore_current_blog();
+
+                $this->assertSame( $expected, $result );
+        }
+
+        /**
+         * @ticket 38253
+         */
+        function test_get_custom_logo_preserves_switched_state() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( 'This test requires multisite.' );
+                }
+
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
+                $expected = $GLOBALS['_wp_switched_stack'];
+
+                get_custom_logo( $blog_id );
+
+                $result = $GLOBALS['_wp_switched_stack'];
+
+                restore_current_blog();
+
+                $this->assertSame( $expected, $result );
+        }
 }