Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 41472)
+++ wp-includes/post.php	(working copy)
@@ -2586,14 +2586,19 @@
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
 function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_post($post_id, true);
+	if ( ! EMPTY_TRASH_DAYS ) {
+		return wp_delete_post( $post_id, true );
+	}
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
+	$post = get_post( $post_id );
+
+	if ( ! $post ) {
 		return $post;
+	}
 
-	if ( $post['post_status'] == 'trash' )
+	if ( 'trash' == $post->post_status ) {
 		return false;
+	}
 
 	/**
 	 * Filters whether a post trashing should take place.
@@ -2617,13 +2622,13 @@
 	 */
 	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());
+	add_post_meta( $post_id,'_wp_trash_meta_status', $post->post_status );
+	add_post_meta( $post_id,'_wp_trash_meta_time', time() );
 
-	$post['post_status'] = 'trash';
+	$post->post_status = 'trash';
 	wp_insert_post( wp_slash( $post ) );
 
-	wp_trash_post_comments($post_id);
+	wp_trash_post_comments( $post_id );
 
 	/**
 	 * Fires after a post is sent to the trash.
@@ -2646,11 +2651,15 @@
  * @return WP_Post|false WP_Post object. False on failure.
  */
 function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
+	$post = get_post( $post_id );
+
+	if ( ! $post ) {
 		return $post;
+	}
 
-	if ( $post['post_status'] != 'trash' )
+	if ( 'trash' != $post->post_status ) {
 		return false;
+	}
 
 	/**
 	 * Filters whether a post untrashing should take place.
@@ -2674,16 +2683,16 @@
 	 */
 	do_action( 'untrash_post', $post_id );
 
-	$post_status = get_post_meta($post_id, '_wp_trash_meta_status', true);
+	$post_status = get_post_meta( $post_id, '_wp_trash_meta_status', true );
 
-	$post['post_status'] = $post_status;
+	$post->post_status = $post_status;
 
-	delete_post_meta($post_id, '_wp_trash_meta_status');
-	delete_post_meta($post_id, '_wp_trash_meta_time');
+	delete_post_meta( $post_id, '_wp_trash_meta_status' );
+	delete_post_meta( $post_id, '_wp_trash_meta_time' );
 
 	wp_insert_post( wp_slash( $post ) );
 
-	wp_untrash_post_comments($post_id);
+	wp_untrash_post_comments( $post_id );
 
 	/**
 	 * Fires after a post is restored from the trash.