Changeset 31135

Timestamp:

01/10/2015 10:57:17 PM (10 years ago)

Author:

wonderboymusic

Message:

In WP_Text_Diff_Renderer_Table:

• In [28525], $_diff_threshold, $inline_diff_renderer, and $_show_split_view were marked protected; magic methods were also added.
• The magic methods should only perform operations on a whitelisted set of properties, now specified in $compat_fields
• Remove __call(), is unnecessary and can wreak havoc on the parent class.

This class is used in one place: wp_text_diff().

See #30891.

File:

• trunk/src/wp-includes/wp-diff.php (modified) (5 diffs)

trunk/src/wp-includes/wp-diff.php

@@ -68 +68 @@
      */
     protected $_show_split_view = true;
+
+    protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' );
 
     /**
@@ -466 +468 @@
      */
     public function __get( $name ) {
-        return $this->$name;
+        if ( in_array( $name, $this->compat_fields ) ) {
+            return $this->$name;
+        }
     }
 
@@ -480 +484 @@
      */
     public function __set( $name, $value ) {
-        return $this->$name = $value;
+        if ( in_array( $name, $this->compat_fields ) ) {
+            return $this->$name = $value;
+        }
     }
 
@@ -493 +499 @@
      */
     public function __isset( $name ) {
-        return isset( $this->$name );
+        if ( in_array( $name, $this->compat_fields ) ) {
+            return isset( $this->$name );
+        }
     }
 
@@ -505 +513 @@
      */
     public function __unset( $name ) {
-        unset( $this->$name );
-    }
-
-    /**
-     * Make private/protected methods readable for backwards compatibility.
-     *
-     * @since 4.0.0
-     * @access public
-     *
-     * @param callable $name      Method to call.
-     * @param array    $arguments Arguments to pass when calling.
-     * @return mixed|bool Return value of the callback, false otherwise.
-     */
-    public function __call( $name, $arguments ) {
-        return call_user_func_array( array( $this, $name ), $arguments );
+        if ( in_array( $name, $this->compat_fields ) ) {
+            unset( $this->$name );
+        }
     }
 }