From b36063b03cc184d42cc219ccbe05e70af4bce6d5 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 27 Feb 2010 06:45:23 +0000
Subject: [PATCH] Restore manage_pages_columns filter in
 wp_manage_posts_columns(). Pass post type to manage_posts_columns, and add a
 manage_{$post_type}_posts_columns filter. fixes #12398

git-svn-id: http://svn.automattic.com/wordpress/trunk@13451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index e18d2cadfe..88aaa0ca33 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -669,8 +669,12 @@ function wp_manage_posts_columns( $screen = '') {
 	if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
 		$posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
 	$posts_columns['date'] = __('Date');
-	// @todo filter per type
-	$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
+
+	if ( 'page' == $post_type )
+		$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+	else
+		$post_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+	$post_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
 
 	return $posts_columns;
 }