From d8e5aabab5abca0f9d034bc0e81c38eca5bd5ba6 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sun, 11 Jan 2015 00:01:22 +0000
Subject: [PATCH] In `WP_Error`:

* `wp_send_json_error()` accesses `$errors` on an instance, it must be `public`
* `$error_data` is a local message cache for error codes and doesn't particularly hide info, would be the only non-public field or method in the class

Make `$errors` and `$error_data` public and remove magic methods.

See #30891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-error.php | 58 ++--------------------------------
 wp-includes/version.php        |  2 +-
 2 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/wp-includes/class-wp-error.php b/wp-includes/class-wp-error.php
index eb13145c58..448482ef7f 100644
--- a/wp-includes/class-wp-error.php
+++ b/wp-includes/class-wp-error.php
@@ -24,18 +24,16 @@ class WP_Error {
 	 *
 	 * @since 2.1.0
 	 * @var array
-	 * @access private
 	 */
-	private $errors = array();
+	public $errors = array();
 
 	/**
 	 * Stores the list of data for error codes.
 	 *
 	 * @since 2.1.0
 	 * @var array
-	 * @access private
 	 */
-	private $error_data = array();
+	public $error_data = array();
 
 	/**
 	 * Initialize the error.
@@ -64,58 +62,6 @@ class WP_Error {
 			$this->error_data[$code] = $data;
 	}
 
-	/**
-	 * Make private properties readable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to get.
-	 * @return mixed Property.
-	 */
-	public function __get( $name ) {
-		return $this->$name;
-	}
-
-	/**
-	 * Make private properties settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name  Property to set.
-	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
-	 */
-	public function __set( $name, $value ) {
-		return $this->$name = $value;
-	}
-
-	/**
-	 * Make private properties checkable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
-	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
-	}
-
-	/**
-	 * Make private properties un-settable for backwards compatibility.
-	 *
-	 * @since 4.0.0
-	 * @access public
-	 *
-	 * @param string $name Property to unset.
-	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
-	}
-
 	/**
 	 * Retrieve all error codes.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 38fcbb9476..50e834c6dc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31137';
+$wp_version = '4.2-alpha-31138';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.