Ticket #35991: 35991.patch

src/wp-includes/class-wp-xmlrpc-server.php

@@ -386 +386 @@
         }
 
         /**
+         * Retrieve custom fields for term.
+         *
+         * @since 4.5.x
+         *
+         * @param int $post_id Post ID.
+         * @return array Custom fields, if exist.
+         */
+        public function get_term_custom_fields($term_id) {
+                $term_id = (int) $term_id;
+        
+                $custom_fields = array();
+        
+                foreach ( (array) has_term_meta($term_id) as $meta ) {
+                        if ( ! current_user_can( 'edit_term_meta', $term_id , $meta['meta_key'] ) )
+                                continue;
+                        $custom_fields[] = array(
+                                "id"    => $meta['meta_id'],
+                                "key"   => $meta['meta_key'],
+                                "value" => $meta['meta_value']
+                        );
+                }
+        
+                return $custom_fields;
+        }
+        
+        /**
+         * Set custom fields for term.
+         *
+         * @since 4.5.x
+         *
+         * @param int $post_id Post ID.
+         * @param array $fields Custom fields.
+         */
+        public function set_term_custom_fields($term_id, $fields) {
+                $term_id = (int) $term_id;
+        
+                foreach ( (array) $fields as $meta ) {
+                        if ( isset($meta['id']) ) {
+                                $meta['id'] = (int) $meta['id'];
+                                $pmeta = get_metadata_by_mid( 'term', $meta['id'] );
+                                if ( isset($meta['key']) ) {
+                                        $meta['key'] = wp_unslash( $meta['key'] );
+                                        if ( $meta['key'] !== $pmeta->meta_key )
+                                                continue;
+                                        $meta['value'] = wp_unslash( $meta['value'] );
+                                        if ( current_user_can( 'edit_term_meta', $term_id, $meta['key'] ) )
+                                                update_metadata_by_mid( 'term', $meta['id'], $meta['value'] );
+                                } elseif ( current_user_can( 'delete_term_meta', $term_id, $pmeta->meta_key ) ) {
+                                        delete_metadata_by_mid( 'term', $meta['id'] );
+                                }
+                        } elseif ( current_user_can( 'add_term_meta', $term_id, wp_unslash( $meta['key'] ) ) ) {
+                                add_term_meta( $term_id, $meta['key'], $meta['value'] );
+                        }
+                }
+        }
+
+        /**
          * Set up blog options property.
          *
          * Passes property through {@see 'xmlrpc_blog_options'} filter.
@@ -724 +781 @@
                 // Count we are happy to return as an integer because people really shouldn't use terms that much.
                 $_term['count'] = intval( $_term['count'] );
 
+                // Get term meta
+                $_term['custom_fields'] = $this->get_term_custom_fields($_term['term_id']);
+
                 /**
                  * Filter XML-RPC-prepared data for the given term.
                  *
@@ -1897 +1957 @@
                 if ( ! $term )
                         return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
 
+                if ( isset( $content_struct['custom_fields'] ) ) {
+                        $this->set_term_custom_fields( $term['term_id'], $content_struct['custom_fields'] );
+                }
+
                 return strval( $term['term_id'] );
         }
 
@@ -1995 +2059 @@
                 if ( ! $term )
                         return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
 
+                // Update term meta
+                if ( isset( $content_struct['custom_fields'] ) ) {
+                        $this->set_term_custom_fields( $term_id, $content_struct['custom_fields'] );
+                }
+
                 return true;
         }
 

src/wp-includes/taxonomy.php

@@ -1877 +1877 @@
 }
 
 /**
+ * Get meta data for the given term ID.
+ *
+ * @since 4.4.x
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $term_id
+ * @return array|false
+ */
+function has_term_meta( $term_id ) {
+        // Bail if term meta table is not installed.
+        if ( get_option( 'db_version' ) < 34370 ) {
+                return;
+        }
+
+        global $wpdb;
+
+        return $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value, meta_id, term_id
+                FROM $wpdb->termmeta WHERE term_id = %d
+                ORDER BY meta_key,meta_id", $term_id), ARRAY_A );
+}
+
+/**
  * Check if Term exists.
  *
  * Formerly is_term(), introduced in 2.3.0.