Changeset 35585

Timestamp:

11/09/2015 03:35:56 AM (10 years ago)

Author:

boonebgorges

Message:

When deleting a term, delete its metadata as well.

Props barryceelen.
Fixes #34626.

Location:

trunk

Files:

• src/wp-includes/meta-functions.php (modified) (2 diffs)
• src/wp-includes/taxonomy-functions.php (modified) (2 diffs)
• tests/phpunit/tests/term/meta.php (modified) (1 diff)

trunk/src/wp-includes/meta-functions.php

@@ -559 +559 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
+ * @param string $meta_type Type of object metadata is for (e.g., comment, post, meta, or user).
  * @param int    $meta_id   ID for a specific meta row
  * @return object|false Meta object or false.
@@ -693 +693 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
+ * @param string $meta_type Type of object metadata is for (e.g., comment, post, term, or user).
  * @param int    $meta_id   ID for a specific meta row
  * @return bool True on successful delete, false on failure.

trunk/src/wp-includes/taxonomy-functions.php

@@ -2055 +2055 @@
  * that term's parent.
  *
+ * Metadata associated with the term will be deleted.
+ *
  * The `$args` 'default' will only override the terms found, if there is only one
  * term found. Any other and the found terms are used.
@@ -2172 +2174 @@
     foreach ( $tax_object->object_type as $object_type )
         clean_object_term_cache( $objects, $object_type );
+
+    $term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
+    foreach ( $term_meta_ids as $mid ) {
+        delete_metadata_by_mid( 'term', $mid );
+    }
 
     /**

trunk/tests/phpunit/tests/term/meta.php

@@ -382 +382 @@
     }
 
+    /**
+     * @ticket 34626
+     */
+    public function test_term_meta_should_be_deleted_when_term_is_deleted() {
+        $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+
+        add_term_meta( $t, 'foo', 'bar' );
+        add_term_meta( $t, 'foo1', 'bar' );
+
+        $this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
+        $this->assertSame( 'bar', get_term_meta( $t, 'foo1', true ) );
+
+        $this->assertTrue( wp_delete_term( $t, 'wptests_tax' ) );
+
+        $this->assertSame( '', get_term_meta( $t, 'foo', true ) );
+        $this->assertSame( '', get_term_meta( $t, 'foo1', true ) );
+    }
+
     public static function set_cache_results( $q ) {
         $q->set( 'cache_results', true );