Changeset 22451

Timestamp:

11/07/2012 10:12:44 PM (12 years ago)

Author:

nacin

Message:

Sanity checks in get_body_class() to ensure we are operating on the type of queried object that we expect. props wonderboymusic. fixes #17662.

File:

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

trunk/wp-includes/post-template.php

@@ -430 +430 @@
 
         $classes[] = 'single';
-        $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
-        $classes[] = 'postid-' . $post_id;
-
-        // Post Format
-        if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-            $post_format = get_post_format( $post->ID );
-
-            if ( $post_format && !is_wp_error($post_format) )
-                $classes[] = 'single-format-' . sanitize_html_class( $post_format );
-            else
-                $classes[] = 'single-format-standard';
+        if ( isset( $post->post_type ) ) {
+            $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
+            $classes[] = 'postid-' . $post_id;
+
+            // Post Format
+            if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+                $post_format = get_post_format( $post->ID );
+
+                if ( $post_format && !is_wp_error($post_format) )
+                    $classes[] = 'single-format-' . sanitize_html_class( $post_format );
+                else
+                    $classes[] = 'single-format-standard';
+            }           
         }
 
@@ -456 +458 @@
             $author = $wp_query->get_queried_object();
             $classes[] = 'author';
-            $classes[] = 'author-' . sanitize_html_class( $author->user_nicename , $author->ID );
-            $classes[] = 'author-' . $author->ID;
+            if ( isset( $author->user_nicename ) ) {
+                $classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
+                $classes[] = 'author-' . $author->ID;               
+            }
         } elseif ( is_category() ) {
             $cat = $wp_query->get_queried_object();
             $classes[] = 'category';
-            $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
-            $classes[] = 'category-' . $cat->term_id;
+            if ( isset( $cat->term_id ) ) {
+                $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
+                $classes[] = 'category-' . $cat->term_id;               
+            }
         } elseif ( is_tag() ) {
             $tags = $wp_query->get_queried_object();
             $classes[] = 'tag';
-            $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
-            $classes[] = 'tag-' . $tags->term_id;
+            if ( isset( $tags->term_id ) ) {
+                $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
+                $classes[] = 'tag-' . $tags->term_id;               
+            }
         } elseif ( is_tax() ) {
             $term = $wp_query->get_queried_object();
-            $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-            $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
-            $classes[] = 'term-' . $term->term_id;
+            if ( isset( $term->term_id ) ) {
+                $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
+                $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
+                $classes[] = 'term-' . $term->term_id;
+            }
         }
     } elseif ( is_page() ) {