Changeset 18445 for trunk/wp-admin/includes/post.php

Timestamp:

07/20/2011 10:04:35 PM (14 years ago)

Author:

ryan

Message:

Introduce register_meta(), get_metadata_by_mid(), and *_post_meta capabilities. fixes #17850

File:

• trunk/wp-admin/includes/post.php (modified) (6 diffs)

trunk/wp-admin/includes/post.php

@@ -211 +211 @@
             if ( $meta->post_id != $post_ID )
                 continue;
-            if ( is_protected_meta( $value['key'] ) )
+            if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
                 continue;
             update_meta( $key, $value['key'], $value['value'] );
@@ -223 +223 @@
             if ( $meta->post_id != $post_ID )
                 continue;
-            if ( is_protected_meta( $meta->meta_key ) )
+            if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
                 continue;
             delete_meta( $key );
@@ -672 +672 @@
         $metavalue = trim( $metavalue );
 
-    if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) {
+    if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) {
         // We have a key/value pair. If both the select and the
         // input for the key have data, the input takes precedence:
@@ -682 +682 @@
             $metakey = $metakeyinput; // default
 
-        if ( is_protected_meta( $metakey ) )
+        if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
             return false;
 
-        wp_cache_delete($post_ID, 'post_meta');
-        $wpdb->insert( $wpdb->postmeta, array( 'post_id' => $post_ID, 'meta_key' => $metakey, 'meta_value' => $metavalue ) );
-        $meta_id = $wpdb->insert_id;
-        do_action( 'added_postmeta', $meta_id, $post_ID, $metakey, $metavalue );
-
-        return $meta_id;
-    }
+        return add_post_meta($post_ID, $metakey, $metavalue);
+    }
+
     return false;
 } // add_meta
@@ -772 +768 @@
             FROM $wpdb->postmeta WHERE post_id = %d
             ORDER BY meta_key,meta_id", $postid), ARRAY_A );
-
 }
 
@@ -789 +784 @@
 
     $meta_key = stripslashes($meta_key);
-
-    if ( is_protected_meta( $meta_key ) )
-        return false;
 
     if ( '' === trim( $meta_value ) )