From 59279c5f8b7b8c2537d2979a749ce116b8665b5e Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 24 Sep 2015 21:48:27 +0000
Subject: [PATCH] Comments: In `get_comment_statuses()`, also return `trash`.
 XML-RPC: In `wp_xmlrpc_server::wp_editComment()`, allow comments to be
 trashed.

Introduce unit tests for `wp_editComment` in `xmlrpc/*` #NeverForget

Props tyxla, wonderboymusic.
Fixes #30965.

Built from https://develop.svn.wordpress.org/trunk@34524


git-svn-id: http://core.svn.wordpress.org/trunk@34488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-functions.php | 2 ++
 wp-includes/version.php           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index abe8291613..7b76dbedeb 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -237,6 +237,8 @@ function get_comment_statuses() {
 		'approve'	=> _x('Approved', 'adjective'),
 		/* translators: comment status */
 		'spam'		=> _x('Spam', 'adjective'),
+		/* translators: comment status */
+		'trash'		=> _x('Trash', 'adjective'),
 	);
 
 	return $status;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index da5ce6759c..cd518eebf2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34523';
+$wp_version = '4.4-alpha-34524';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.