Ticket #39493: 39493.2.diff

src/wp-includes/post-template.php

@@ -616 +616 @@
                 if ( is_single() ) {
                         $classes[] = 'single';
                         if ( isset( $post->post_type ) ) {
-                                $classes[] = 'single-' . sanitize_html_class( $post->post_type, $post_id );
+                                $post_type_class = sanitize_html_class( $post->post_type, $post_id );
+                                $classes[] = 'single-' . $post_type_class;
+                                $classes[] = 'single-' . $post_type_class . '-' . sanitize_html_class( $post->post_name, $post_id );
                                 $classes[] = 'postid-' . $post_id;
 
                                 // Post Format
@@ -641 +643 @@
 
                         $page_id = $wp_query->get_queried_object_id();
 
-                        $post = get_post($page_id);
+                        $post = get_post( $page_id );
 
+                        $classes[] = 'page-' . sanitize_html_class( $post->post_name, $page_id );
                         $classes[] = 'page-id-' . $page_id;
 
                         if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {

tests/phpunit/tests/post/getBodyClass.php

@@ -92 +92 @@
                 $this->assertContains( "single-format-standard", $class );
         }
 
+        /**
+         * @ticket 39493
+         */
+        public function test_singular_body_classes_should_contain_post_slug() {
+                $post_id = self::factory()->post->create();
+                $this->go_to( get_permalink( $post_id ) );
+
+                $class = get_body_class();
+                $post = get_post( $post_id );
+                $this->assertContains( "single-post-{$post->post_name}", $class );
+        }
+
+        /**
+         * @ticket 39493
+         */
+        public function test_singular_body_classes_should_contain_page_slug() {
+                $post_id = self::factory()->post->create( array(
+                        'post_type' => 'page',
+                ) );
+                $this->go_to( get_permalink( $post_id ) );
+
+                $class = get_body_class();
+                $post = get_post( $post_id );
+                $this->assertContains( "page-{$post->post_name}", $class );
+        }
+
         public function test_page_template_body_classes_no_template() {
                 $post_id = self::factory()->post->create( array(
                         'post_type' => 'page',