Changeset 36949 for trunk/src/wp-includes/general-template.php

Timestamp:

03/10/2016 06:56:56 PM (9 years ago)

Author:

obenland

Message:

Tests: Introduce multisite unit tests.

Makes sure custom logo functions work for other sites within a network.
Fixes a bug in get_custom_logo() where the correct logo was returned, but
linked to the wrong site.

H/t ocean90.
See #33755, #36086.

File:

• trunk/src/wp-includes/general-template.php (modified) (2 diffs)

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

@@ -877 +877 @@
 
     $custom_logo_id = get_theme_mod( 'custom_logo' );
-
-    if ( is_multisite() && ms_is_switched() ) {
-        restore_current_blog();
-    }
-    $size = get_theme_support( 'custom-logo', 'size' );
+    $size           = get_theme_support( 'custom-logo', 'size' );
 
     // We have a logo. Logo is go.
@@ -901 +897 @@
             esc_attr( $size )
         );
+    }
+
+    if ( is_multisite() && ms_is_switched() ) {
+        restore_current_blog();
     }