Changeset 45088

Timestamp:

04/01/2019 04:17:11 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Customize: Only add custom-background to body_class() if the current theme supports custom background.

Props wido, swissspidy, ocean90, Mte90.
Fixes #38168.

Location:

trunk

Files:

• src/wp-includes/post-template.php (modified) (1 diff)
• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/post/getBodyClass.php (modified) (1 diff)

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

@@ -774 +774 @@
     }
 
-    if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) {
+    if ( current_theme_supports( 'custom-background' )
+        && ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) ) {
         $classes[] = 'custom-background';
     }

trunk/src/wp-includes/theme.php

@@ -2731 +2731 @@
             }
             $support = get_theme_support( 'custom-background' );
-            remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+            if ( isset( $support[0]['wp-head-callback'] ) ) {
+                remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+            }
             remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
             unset( $GLOBALS['custom_background'] );

trunk/tests/phpunit/tests/post/getBodyClass.php

@@ -205 +205 @@
 
     /**
+     * @ticket 38168
+     */
+    public function test_custom_background_class_is_added_when_theme_supports_it() {
+        add_theme_support( 'custom-background', array( 'default-color', '#ffffff' ) );
+        set_theme_mod( 'background_color', '#000000' );
+
+        $class = get_body_class();
+        $current_theme_supports_custom_background = current_theme_supports( 'custom-background' );
+
+        remove_theme_mod( 'background_color' );
+        remove_theme_support( 'custom-background' );
+
+        $this->assertTrue( $current_theme_supports_custom_background );
+        $this->assertContains( 'custom-background', $class );
+    }
+
+    /**
+     * @ticket 38168
+     */
+    public function test_custom_background_class_is_not_added_when_theme_support_is_missing() {
+        set_theme_mod( 'background_color', '#000000' );
+
+        $class = get_body_class();
+        $current_theme_supports_custom_background = current_theme_supports( 'custom-background' );
+
+        remove_theme_mod( 'background_color' );
+
+        $this->assertFalse( $current_theme_supports_custom_background );
+        $this->assertNotContains( 'custom-background', $class );
+    }
+
+    /**
      * @ticket 44005
      * @group privacy