Changeset 38786

Timestamp:

10/13/2016 10:27:15 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Maintain switched state in site icon/logo functions.

Adjusts get_custom_logo(), get_site_icon_url(), and has_custom_logo() so that when called in a switched state, the original switched stack is not adjusted.

Props achbed, flixos90.
Fixes #38253.

Location:

trunk

Files:

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

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

@@ -784 +784 @@
  */
 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;
     }
 
@@ -799 +802 @@
     }
 
-    if ( is_multisite() && ms_is_switched() ) {
+    if ( $switched_blog ) {
         restore_current_blog();
     }
@@ -849 +852 @@
  */
 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();
     }
@@ -872 +878 @@
 function get_custom_logo( $blog_id = 0 ) {
     $html = '';
-
-    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;
     }
 
@@ -897 +905 @@
     }
 
-    if ( is_multisite() && ms_is_switched() ) {
+    if ( $switched_blog ) {
         restore_current_blog();
     }

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

@@ -489 +489 @@
         $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 );
+    }
 }