Revert "Simplified post class filter"

This reverts commit f5f7fed.

Author: ozzyrod

includes/context.php

@@ -44,11 +44,35 @@ function carelib_body_class_filter( $classes ) {
  *
  * @since  1.0.0
  * @access public
- * @param  array $classes
+ * @param  array        $classes
+ * @param  string|array $class
+ * @param  int          $post_id
  * @return array
  */
-function carelib_post_class_filter( $classes ) {
-	return array_diff( $classes, array( 'hentry' ) );
+function carelib_post_class_filter( $classes, $class, $post_id ) {
+	$_classes    = array();
+	$post        = get_post( $post_id );
+	$post_type   = get_post_type();
+	$post_status = get_post_status();
+
+	$remove = array( 'hentry', "type-{$post_type}", "status-{$post_status}" );
+
+	foreach ( $classes as $key => $class ) {
+
+		if ( in_array( $class, $remove, true ) ) {
+			unset( $classes[ $key ] );
+		} else {
+			$classes[ $key ] = str_replace( 'tag-', 'post_tag-', $class );
+		}
+	}
+
+	$_classes[] = 'entry';
+	$_classes[] = $post_type;
+	$_classes[] = $post_status;
+
+	$_classes = array_map( 'esc_attr', $_classes );
+
+	return array_unique( array_merge( $_classes, $classes ) );
 }
 
 /**

includes/filters.php

@@ -280,7 +280,7 @@
  *
  * @see carelib_post_class_filter
  */
-add_filter( 'post_class', 'carelib_post_class_filter', 0 );
+add_filter( 'post_class', 'carelib_post_class_filter', 0, 3 );
 
 /**
  * Callback defined in includes/context.php