Ticket #50568: wp-includes.patch

wp-includes/category.php

@@ -247 +247 @@
         return term_is_ancestor_of( $cat1, $cat2, 'category' );
 }
 
+// deprecate this?
 /**
  * Sanitizes category data based on context.
  *
@@ -260 +261 @@
         return sanitize_term( $category, 'category', $context );
 }
 
+// deprecate this?
 /**
  * Sanitizes data in single category key field.
  *

wp-includes/class-wp-term.php

@@ -180 +180 @@
                         }
                 }
 
-                $term_obj = new WP_Term( $_term );
-                $term_obj->filter( $term_obj->filter );
-
-                return $term_obj;
+                return new WP_Term( $_term );
         }
 
         /**
@@ -207 +204 @@
          * @param string $filter Filter context. Accepts 'edit', 'db', 'display', 'attribute', 'js', 'raw'.
          */
         public function filter( $filter ) {
-                sanitize_term( $this, $this->taxonomy, $filter );
+                if ( $this->filter === $filter ) {
+                        return $this;
+                }
+
+                if ( 'raw' === $filter ) {
+                        return self::get_instance( $this->term_id );
+                }
+
+                return sanitize_term( $this, $this->taxonomy, $filter );
         }
 
         /**

wp-includes/taxonomy.php

@@ -828 +828 @@
         if ( $term instanceof WP_Term ) {
                 $_term = $term;
         } elseif ( is_object( $term ) ) {
-                if ( empty( $term->filter ) || 'raw' === $term->filter ) {
+                if ( empty( $term->filter ) ) {
                         $_term = sanitize_term( $term, $taxonomy, 'raw' );
                         $_term = new WP_Term( $_term );
+                } elseif ( 'raw' === $term->filter ) {
+                        $_term = new WP_Term( $_term );
                 } else {
                         $_term = WP_Term::get_instance( $term->term_id );
                 }
@@ -1481 +1483 @@
  * @param array|object $term     The term to check.
  * @param string       $taxonomy The taxonomy name to use.
  * @param string       $context  Optional. Context in which to sanitize the term. Accepts 'edit', 'db',
- *                               'display', 'attribute', or 'js'. Default 'display'.
+ *                               'display', 'attribute', 'raw', or 'js'. Default 'display'.
  * @return array|object Term with all fields sanitized.
  */
 function sanitize_term( $term, $taxonomy, $context = 'display' ) {
+        // This array doesn't match WP>4.4 WP_Term per se... scrutinize me?
         $fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
 
-        $do_object = is_object( $term );
-
-        $term_id = $do_object ? $term->term_id : ( isset( $term['term_id'] ) ? $term['term_id'] : 0 );
-
-        foreach ( (array) $fields as $field ) {
-                if ( $do_object ) {
+        if ( is_object( $term ) ) {
+                // Check if term already filtered for this context.
+                if ( isset( $term->filter ) && $context === $term->filter ) {
+                        return $term;
+                }
+                if ( ! isset( $term->term_id ) ) {
+                        $term->term_id = 0;
+                }
+                foreach ( (array) $fields as $field ) {
                         if ( isset( $term->$field ) ) {
-                                $term->$field = sanitize_term_field( $field, $term->$field, $term_id, $taxonomy, $context );
+                                $term->$field = sanitize_term_field( $field, $term->$field, $term->term_id, $taxonomy, $context );
                         }
-                } else {
+                }
+                $term->filter = $context;
+        } elseif ( is_array( $term ) ) {
+                // Check if term already filtered for this context.
+                if ( isset( $term['filter'] ) && $context === $term['filter'] ) {
+                        return $term;
+                }
+                if ( ! isset( $term['term_id'] ) ) {
+                        $term['term_id'] = 0;
+                }
+                foreach ( (array) $fields as $field ) {
                         if ( isset( $term[ $field ] ) ) {
-                                $term[ $field ] = sanitize_term_field( $field, $term[ $field ], $term_id, $taxonomy, $context );
+                                $term->$field = sanitize_term_field( $field, $term[ $field ], $term['term_id'], $taxonomy, $context );
                         }
                 }
-        }
-
-        if ( $do_object ) {
-                $term->filter = $context;
-        } else {
                 $term['filter'] = $context;
         }
-
         return $term;
 }
 
@@ -1532 +1542 @@
  * @param int    $term_id  Term ID.
  * @param string $taxonomy Taxonomy Name.
  * @param string $context  Context in which to sanitize the term field. Accepts 'edit', 'db', 'display',
- *                         'attribute', or 'js'.
+ *                         'attribute', 'raw', or 'js'.
  * @return mixed Sanitized field.
  */
 function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
@@ -1544 +1554 @@
                 }
         }
 
+        // Needless. Expect the dev to respect the API. Is this a backward compat thing?
         $context = strtolower( $context );
 
         if ( 'raw' === $context ) {
@@ -2512 +2523 @@
                         if ( is_int( $term ) ) {
                                 continue;
                         }
-
                         $term_info = wp_insert_term( $term, $taxonomy );
                 }
 
@@ -3512 +3522 @@
                 // Object ID should not be cached.
                 unset( $_term->object_id );
 
+                if ( empty( $_term->filter ) ) {
+                        $_term = sanitize_term( $_term, $_term->taxonomy, 'raw' );
+                }
                 wp_cache_add( $term->term_id, $_term, 'terms' );
         }
 }