Changeset 31151 for trunk/src/wp-includes/query.php

Timestamp:

01/11/2015 10:40:53 PM (10 years ago)

Author:

wonderboymusic

Message:

In WP_Query, only call magic method internals again whitelists of properties and methods, $compat_fields and $compat_methods. Remove __unset() since __set() is not implemented.

See #30891.

File:

• trunk/src/wp-includes/query.php (modified) (4 diffs)

trunk/src/wp-includes/query.php

@@ -1300 +1300 @@
      */
     private $stopwords;
+
+    private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' );
+
+    private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
 
     /**
@@ -3957 +3961 @@
      */
     public function __get( $name ) {
-        return $this->$name;
-    }
-
-    /**
-     * Make private properties settable for backwards compatibility.
+        if ( in_array( $name, $this->compat_fields ) ) {
+            return $this->$name;
+        }
+    }
+
+    /**
+     * Make private properties checkable for backwards compatibility.
      *
      * @since 4.0.0
@@ -3970 +3976 @@
      */
     public function __isset( $name ) {
-        return isset( $this->$name );
-    }
-
-    /**
-     * Make private properties settable for backwards compatibility.
-     *
-     * @since 4.0.0
-     * @access public
-     *
-     * @param string $name Property to unset.
-     */
-    public function __unset( $name ) {
-        unset( $this->$name );
+        if ( in_array( $name, $this->compat_fields ) ) {
+            return isset( $this->$name );
+        }
     }
 
@@ -3993 +3989 @@
      * @param callable $name      Method to call.
      * @param array    $arguments Arguments to pass when calling.
-     * @return mixed|bool Return value of the callback, otherwise false.
+     * @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_methods ) ) {
+            return call_user_func_array( array( $this, $name ), $arguments );
+        }
+        return false;
     }