Ticket #18196: 18196.patch

wp-includes/post.php

@@ -1497 +1497 @@
  * @return bool Whether the post meta key was deleted from the database
  */
 function delete_post_meta_by_key($post_meta_key) {
-        if ( !$post_meta_key )
-                return false;
-
-        global $wpdb;
-        $post_ids = $wpdb->get_col($wpdb->prepare("SELECT DISTINCT post_id FROM $wpdb->postmeta WHERE meta_key = %s", $post_meta_key));
-        if ( $post_ids ) {
-                $postmetaids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = %s", $post_meta_key ) );
-                $in = implode( ',', array_fill(1, count($postmetaids), '%d'));
-                do_action( 'delete_postmeta', $postmetaids );
-                $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_id IN($in)", $postmetaids ));
-                do_action( 'deleted_postmeta', $postmetaids );
-                foreach ( $post_ids as $post_id )
-                        wp_cache_delete($post_id, 'post_meta');
-                return true;
-        }
-        return false;
+        return delete_metadata( 'post', null, $post_meta_key, '', true );
 }
 
 /**

wp-includes/meta.php

@@ -149 +149 @@
         }
 
         do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+        
+        if ( 'post' == $meta_type )
+                do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );   
 
         $wpdb->update( $table, $data, $where );
 
@@ -158 +161 @@
                 clean_user_cache($object_id);
 
         do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+        
+        if ( 'post' == $meta_type )
+                do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );          
 
         return true;
 }
@@ -218 +224 @@
                 return false;
 
         do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
-
+        
+        if ( 'post' == $meta_type ) {
+                $first_meta_id = sizeof( $meta_ids ) > 0 ? $meta_ids[0] : null;
+                do_action( 'delete_postmeta', $delete_all ? $meta_ids : $first_meta_id );
+        }
+        
         $query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
-
+        
         $count = $wpdb->query($query);
 
         if ( !$count )
@@ -232 +243 @@
                 clean_user_cache($object_id);
 
         do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
+        
+        if ( 'post' == $meta_type ) {
+                do_action( 'deleted_postmeta', $delete_all ? $meta_ids : $first_meta_id );      
+        }
 
         return true;
 }

wp-admin/includes/post.php

@@ -701 +701 @@
  * @return unknown
  */
 function delete_meta( $mid ) {
-        global $wpdb;
-        $mid = (int) $mid;
+        $meta = get_metadata_by_mid( 'post', $mid );
 
-        $post_id = $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
-
-        do_action( 'delete_postmeta', $mid );
-        wp_cache_delete($post_id, 'post_meta');
-        $rval = $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
-        do_action( 'deleted_postmeta', $mid );
-
-        return $rval;
+        return delete_metadata( 'post', $meta->post_id, $meta->meta_key, $meta->meta_value );
 }
 
 /**
@@ -742 +734 @@
  * @return unknown
  */
 function get_post_meta_by_id( $mid ) {
-        global $wpdb;
-        $mid = (int) $mid;
-
-        $meta = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE meta_id = %d", $mid) );
-        if ( empty($meta) )
-                return false;
-        if ( is_serialized_string( $meta->meta_value ) )
-                $meta->meta_value = maybe_unserialize( $meta->meta_value );
-        return $meta;
+        return get_metadata_by_mid( 'post', $mid );
 }
 
 /**
@@ -782 +766 @@
  * @return unknown
  */
 function update_meta( $meta_id, $meta_key, $meta_value ) {
-        global $wpdb;
-
-        $meta_key = stripslashes($meta_key);
-
-        if ( '' === trim( $meta_value ) )
-                return false;
-
-        $post_id = $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = %d", $meta_id) );
-
-        $meta_value = maybe_serialize( stripslashes_deep( $meta_value ) );
-        $meta_id = (int) $meta_id;
-
-        $data  = compact( 'meta_key', 'meta_value' );
-        $where = compact( 'meta_id' );
-
-        do_action( 'update_postmeta', $meta_id, $post_id, $meta_key, $meta_value );
-        $rval = $wpdb->update( $wpdb->postmeta, $data, $where );
-        wp_cache_delete($post_id, 'post_meta');
-        do_action( 'updated_postmeta', $meta_id, $post_id, $meta_key, $meta_value );
-
-        return $rval;
+        $meta = get_metadata_by_mid( 'post', $meta_id);
+        return update_metadata( 'post', $meta->post_id, $meta_key, $meta_value, $meta->meta_value );
 }
 
 //