Ticket #38168: 38168.2.diff

src/wp-includes/post-template.php

@@ -715 +715 @@
                 $classes[] = 'no-customize-support';
         }
 
-        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';
+        }
 
         if ( has_custom_logo() ) {
                 $classes[] = 'wp-custom-logo';

tests/phpunit/tests/post/getBodyClass.php

@@ -177 +177 @@
                 $this->assertContains( "attachmentid-{$attachment_id}", $class );
                 $this->assertContains( 'attachment-jpeg', $class );
         }
+
+        /**
+         * @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' );
+
+                $actual = 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', $actual );
+        }
+
+        /**
+         * @ticket 38168
+         */
+        public function test_custom_background_class_is_not_added_when_theme_support_is_missing() {
+                set_theme_mod( 'background_color', '#000000' );
+
+                $actual = 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', $actual );
+        }
 }