Changeset 28511

Timestamp:

05/19/2014 05:49:22 AM (11 years ago)

Author:

wonderboymusic

Message:

Add access modifiers to methods/members in WP_Error. Add a magic __get() method for BC.

See #27881, #22234.

File:

• trunk/src/wp-includes/class-wp-error.php (modified) (11 diffs)

trunk/src/wp-includes/class-wp-error.php

@@ -27 +27 @@
      * @access private
      */
-    var $errors = array();
+    private $errors = array();
 
     /**
@@ -36 +36 @@
      * @access private
      */
-    var $error_data = array();
+    private $error_data = array();
 
     /**
@@ -55 +55 @@
      * @return WP_Error
      */
-    function __construct($code = '', $message = '', $data = '') {
+    public function __construct($code = '', $message = '', $data = '') {
         if ( empty($code) )
             return;
@@ -66 +66 @@
 
     /**
+     * Make private properties readable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @return mixed
+     */
+    public function __get( $name ) {
+        return $this->$name;
+    }
+
+    /**
      * Retrieve all error codes.
      *
@@ -73 +84 @@
      * @return array List of error codes, if available.
      */
-    function get_error_codes() {
+    public function get_error_codes() {
         if ( empty($this->errors) )
             return array();
@@ -88 +99 @@
      * @return string|int Empty string, if no error codes.
      */
-    function get_error_code() {
+    public function get_error_code() {
         $codes = $this->get_error_codes();
 
@@ -105 +116 @@
      * @return array Error strings on success, or empty array on failure (if using code parameter).
      */
-    function get_error_messages($code = '') {
+    public function get_error_messages($code = '') {
         // Return all messages if no code specified.
         if ( empty($code) ) {
@@ -132 +143 @@
      * @return string
      */
-    function get_error_message($code = '') {
+    public function get_error_message($code = '') {
         if ( empty($code) )
             $code = $this->get_error_code();
@@ -149 +160 @@
      * @return mixed Null, if no errors.
      */
-    function get_error_data($code = '') {
+    public function get_error_data($code = '') {
         if ( empty($code) )
             $code = $this->get_error_code();
@@ -168 +179 @@
      * @param mixed $data Optional. Error data.
      */
-    function add($code, $message, $data = '') {
+    public function add($code, $message, $data = '') {
         $this->errors[$code][] = $message;
         if ( ! empty($data) )
@@ -184 +195 @@
      * @param string|int $code Error code.
      */
-    function add_data($data, $code = '') {
+    public function add_data($data, $code = '') {
         if ( empty($code) )
             $code = $this->get_error_code();