Changeset 30140

Timestamp:

11/01/2014 02:38:19 AM (12 years ago)

Author:

boonebgorges

Message:

Pass all updated meta IDs to filters in update_metadata().

Props wonderboymusic.
Fixes #11683.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (5 diffs)
• tests/phpunit/tests/meta.php (modified) (3 diffs)

trunk/src/wp-includes/meta.php

@@ -197 +197 @@
         }
 
-        if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
+        $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) );
+        if ( empty( $meta_ids ) ) {
                 return add_metadata($meta_type, $object_id, $meta_key, $passed_value);
+        }
 
         $_meta_value = $meta_value;
@@ -224 +226 @@
          * @param mixed  $meta_value Meta value.
          */
-        do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
-
-        if ( 'post' == $meta_type )
+        foreach ( $meta_ids as $meta_id ) {
+                do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+        }
+
+        if ( 'post' == $meta_type ) {
                 /**
                  * Fires immediately before updating a post's metadata.
@@ -237 +241 @@
                  * @param mixed  $meta_value Meta value.
                  */
-                do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+                foreach ( $meta_ids as $meta_id ) {
+                        do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+                }
+        }
 
         $result = $wpdb->update( $table, $data, $where );
@@ -258 +265 @@
          * @param mixed  $meta_value Meta value.
          */
-        do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+        foreach ( $meta_ids as $meta_id ) {
+                do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+        }
 
         if ( 'post' == $meta_type ) {
@@ -271 +280 @@
                  * @param mixed  $meta_value Meta value.
                  */
-                do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+                foreach ( $meta_ids as $meta_id ) {
+                        do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+                }
         }
 

trunk/tests/phpunit/tests/meta.php

@@ -5 +5 @@
  */
 class Tests_Meta extends WP_UnitTestCase {
+        protected $updated_mids = array();
+
         function setUp() {
                 parent::setUp();
@@ -75 +77 @@
                 $second = get_user_meta( $meta->user_id, $meta->meta_key );
                 $this->assertFalse( $first === $second );
+        }
+
+        /**
+         * @ticket 11683
+         */
+        public function test_update_metadata_hooks_for_multiple_updated_rows() {
+                add_metadata( 'post', 1, 'test_key', 'value_1' );
+                add_metadata( 'post', 1, 'test_key', 'value_2' );
+                add_action( 'update_post_meta', array( $this, 'updated_meta' ) );
+                add_action( 'update_postmeta', array( $this, 'updated_meta' ) );
+                add_action( 'updated_post_meta', array( $this, 'updated_meta' ) );
+                add_action( 'updated_postmeta', array( $this, 'updated_meta' ) );
+
+                update_metadata( 'post', 1, 'test_key', 'value_3' );
+
+                remove_action( 'update_post_meta', array( $this, 'updated_meta' ) );
+                remove_action( 'update_postmeta', array( $this, 'updated_meta' ) );
+                remove_action( 'updated_post_meta', array( $this, 'updated_meta' ) );
+                remove_action( 'updated_postmeta', array( $this, 'updated_meta' ) );
+
+                $found = $this->updated_mids;
+                $this->updated_mids = array();
+
+                foreach ( $found as $action => $mids ) {
+                        $this->assertSame( 2, count( $mids ) );
+                }
         }
 
@@ -301 +329 @@
                 $this->assertSame( array( $data ), $found['foo'] );
         }
+
+        /** Helpers **********************************************************/
+
+        public function updated_meta( $meta_id ) {
+                $this->updated_mids[ current_action() ][] = $meta_id;
+        }
 }