Changeset 13489

Timestamp:

02/28/2010 07:12:05 AM (15 years ago)

Author:

dd32

Message:

Fix slashing in Custom fields values. Allow for the meta_key to be updated without changing meta_value. Use wpdb::insert in add_meta(). Fixes #12418

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (2 diffs)
• includes/post.php (modified) (3 diffs)
• includes/template.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -855 +855 @@
             'supplemental' => array('postid' => $pid)
         ) );
-    } else {
+    } else { // Update?
         $mid = (int) array_pop(array_keys($_POST['meta']));
         $key = $_POST['meta'][$mid]['key'];
@@ -863 +863 @@
         if ( !current_user_can( 'edit_post', $meta->post_id ) )
             die('-1');
-        if ( $meta->meta_value != stripslashes($value) ) {
+        if ( $meta->meta_value != stripslashes($value) || $meta->meta_key != stripslashes($key) ) {
             if ( !$u = update_meta( $mid, $key, $value ) )
                 die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).

trunk/wp-admin/includes/post.php

@@ -598 +598 @@
 
         wp_cache_delete($post_ID, 'post_meta');
-
-        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) );
+        $wpdb->insert( $wpdb->postmeta, array( 'post_id' => $post_ID, 'meta_key' => $metakey, 'meta_value' => $metavalue ) );
         do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, $metakey, $metavalue );
 
@@ -691 +690 @@
  *
  * @param unknown_type $meta_id
- * @param unknown_type $meta_key
- * @param unknown_type $meta_value
+ * @param unknown_type $meta_key Expect Slashed
+ * @param unknown_type $meta_value Expect Slashed
  * @return unknown
  */
@@ -699 +698 @@
 
     $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' );
+
+    $meta_key = stripslashes($meta_key);
 
     if ( in_array($meta_key, $protected) )

trunk/wp-admin/includes/template.php

@@ -2451 +2451 @@
 
     foreach ( $keys as $key ) {
-        $key = esc_attr( $key );
-        echo "\n<option value='" . esc_attr($key) . "'>$key</option>";
+        echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
     }
 ?>
@@ -3290 +3289 @@
                 <label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
                 <input type="text" id="find-posts-input" name="ps" value="" />
-                <input type="button" onClick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
+                <input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
                 <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
@@ -3300 +3299 @@
         </div>
         <div class="find-box-buttons">
-            <input type="button" class="button alignleft" onClick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
+            <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
             <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
         </div>