Changeset 35269 for trunk/src/wp-includes/class-wp-term.php

Timestamp:

10/19/2015 03:11:30 AM (9 years ago)

Author:

boonebgorges

Message:

Don't store data as a property on WP_Term objects.

wp_ajax_add_term() fetches a term using get_term(), and passes the term to
WP_Ajax_Response, which expects each of the term's properties to be scalar.
Having $data as a stdClass (meant to mimic WP_User::data, populated by
a get_row() database query) violated this expectation, causing fatal string
conversion errors. As a workaround, $term->data is converted so that it is
no longer an actual property of the term object, but is assembled only when
requested in the magic __get() method.

Fixes #34348.

File:

• trunk/src/wp-includes/class-wp-term.php (modified) (3 diffs)

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

@@ -97 +97 @@
 
     /**
-     * Info about the term, as stored in the database.
-     *
-     * @since 4.4.0
-     * @access protected
-     * @var array
-     */
-    protected $data = array();
-
-    /**
      * Stores the term object's sanitization level.
      *
@@ -167 +158 @@
             $this->$key = $value;
         }
-
-        $this->data = sanitize_term( $term, $this->taxonomy, $this->filter );
     }
 
@@ -206 +195 @@
         switch ( $key ) {
             case 'data' :
-                return sanitize_term( $this->{$key}, $this->data->taxonomy, 'raw' );
+                $data = new stdClass();
+                $columns = array( 'term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count' );
+                foreach ( $columns as $column ) {
+                    $data->{$column} = isset( $this->{$column} ) ? $this->{$column} : null;
+                }
+
+                return sanitize_term( $data, $data->taxonomy, 'raw' );
                 break;
         }