From 25eca6974e404dbd20c88205fd138cd7ac6f5b96 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 16 Dec 2015 17:38:27 +0000
Subject: [PATCH] Docs: Add a missing summary, `@since` version, and parameter
 descriptions to the DocBlock for `wp_xmlrpc_server::pingback_error()`.

Introduced in [23329]. Also corrects return descriptions for two deprecated methods.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-xmlrpc-server.php | 14 +++++++++-----
 wp-includes/version.php                |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 2e453c9aae..31e5e4505f 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -4532,7 +4532,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @deprecated 3.5.0
 	 *
 	 * @param array $args Unused.
-	 * @return IXR_Error Error message.
+	 * @return IXR_Error Error object.
 	 */
 	public function blogger_getTemplate($args) {
 		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
@@ -4545,7 +4545,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @deprecated 3.5.0
 	 *
 	 * @param array $args Unused.
-	 * @return IXR_Error Error message.
+	 * @return IXR_Error Error object.
 	 */
 	public function blogger_setTemplate($args) {
 		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
@@ -6417,9 +6417,13 @@ class wp_xmlrpc_server extends IXR_Server {
 	}
 
 	/**
-	 * @param integer $code
-	 * @param string $message
-	 * @return IXR_Error
+	 * Sends a pingback error based on the given error code and message.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param int    $code    Error code.
+	 * @param string $message Error message.
+	 * @return IXR_Error Error object.
 	 */
 	protected function pingback_error( $code, $message ) {
 		/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 037a64cf0b..f9e88b43a0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-35963';
+$wp_version = '4.5-alpha-35964';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.