From df5f69fabc06e5f7cee7f0a6de39638b469aa61a Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Fri, 14 Oct 2011 18:39:31 +0000
Subject: [PATCH] In wp_trash_post(), rename the trash_post action to
 wp_trash_post to avoid collision with the wp_transition_post_status()
 trash_post state transition. Props SergeyBiryukov. fixes #15628

git-svn-id: https://develop.svn.wordpress.org/trunk@18974 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/post.php b/wp-includes/post.php
index d305dd82e8..c4ce1af425 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -2075,7 +2075,7 @@ function wp_trash_post($post_id = 0) {
 	if ( $post['post_status'] == 'trash' )
 		return false;
 
-	do_action('trash_post', $post_id);
+	do_action('wp_trash_post', $post_id);
 
 	add_post_meta($post_id,'_wp_trash_meta_status', $post['post_status']);
 	add_post_meta($post_id,'_wp_trash_meta_time', time());