Changeset 31408

Timestamp:

02/11/2015 03:59:06 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Always pass back the custom classes get_post_class() was called with, even if the post was not found.

props F J Kaiser, Bueltge.
fixes #22271.

Location:

trunk

Files:

• src/wp-includes/post-template.php (modified) (2 diffs)
• tests/phpunit/tests/post/getPostClass.php (modified) (1 diff)

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

@@ -405 +405 @@
  */
 function get_post_class( $class = '', $post_id = null ) {
-        $post = get_post($post_id);
+        $post = get_post( $post_id );
 
         $classes = array();
 
-        if ( empty($post) )
+        if ( $class ) {
+                if ( ! is_array( $class ) ) {
+                        $class = preg_split( '#\s+#', $class );
+                }
+                $classes = array_map( 'esc_attr', $class );
+        }
+
+        if ( ! $post ) {
                 return $classes;
+        }
 
         $classes[] = 'post-' . $post->ID;
@@ -467 +475 @@
         }
 
-        if ( !empty($class) ) {
-                if ( !is_array( $class ) )
-                        $class = preg_split('#\s+#', $class);
-                $classes = array_merge($classes, $class);
-        }
-
-        $classes = array_map('esc_attr', $classes);
+        $classes = array_map( 'esc_attr', $classes );
 
         /**

trunk/tests/phpunit/tests/post/getPostClass.php

@@ -46 +46 @@
 
         /**
+         * @ticket 22271
+         */
+        public function test_with_custom_classes_and_no_post() {
+                $this->assertEquals( array(), get_post_class( '', null ) );
+                $this->assertEquals( array( 'foo' ), get_post_class( 'foo', null ) );
+                $this->assertEquals( array( 'foo', 'bar' ),  get_post_class( array( 'foo', 'bar' ), null ) );
+        }
+
+        /**
          * @group cache
          */