From c27548265e6b2782a9e1d6b6ffa52418c2cee043 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Sat, 1 Nov 2014 02:39:24 +0000 Subject: [PATCH] Pass all updated meta IDs to filters in `update_metadata()`. Props wonderboymusic. Fixes #11683. Built from https://develop.svn.wordpress.org/trunk@30140 git-svn-id: http://core.svn.wordpress.org/trunk@30140 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/meta.php | 23 +++++++++++++++++------ wp-includes/version.php | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/wp-includes/meta.php b/wp-includes/meta.php index d56d81bbc9..5541d12227 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -196,8 +196,10 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v } } - 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; $meta_value = maybe_serialize( $meta_value ); @@ -223,9 +225,11 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * @param string $meta_key Meta key. * @param mixed $meta_value Meta value. */ - do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); + foreach ( $meta_ids as $meta_id ) { + do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value ); + } - if ( 'post' == $meta_type ) + if ( 'post' == $meta_type ) { /** * Fires immediately before updating a post's metadata. * @@ -236,7 +240,10 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * @param string $meta_key Meta key. * @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 ); if ( ! $result ) @@ -257,7 +264,9 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * @param string $meta_key Meta key. * @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 ) { /** @@ -270,7 +279,9 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v * @param string $meta_key Meta key. * @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 ); + } } return true; diff --git a/wp-includes/version.php b/wp-includes/version.php index 1190a8a485..41a643475a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30139'; +$wp_version = '4.1-alpha-30140'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.