<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13489] trunk/wp-admin: Fix slashing in Custom fields values.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13489">13489</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 07:12:05 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/12418">#12418</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (13488 => 13489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-02-28 06:38:15 UTC (rev 13488)
+++ trunk/wp-admin/admin-ajax.php 2010-02-28 07:12:05 UTC (rev 13489)
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx"> 'position' => 1,
</span><span class="cx"> 'supplemental' => array('postid' => $pid)
</span><span class="cx"> ) );
</span><del>- } else {
</del><ins>+ } else { // Update?
</ins><span class="cx"> $mid = (int) array_pop(array_keys($_POST['meta']));
</span><span class="cx"> $key = $_POST['meta'][$mid]['key'];
</span><span class="cx"> $value = $_POST['meta'][$mid]['value'];
</span><span class="lines">@@ -862,7 +862,7 @@
</span><span class="cx"> die('0'); // if meta doesn't exist
</span><span class="cx"> if ( !current_user_can( 'edit_post', $meta->post_id ) )
</span><span class="cx"> die('-1');
</span><del>- if ( $meta->meta_value != stripslashes($value) ) {
</del><ins>+ if ( $meta->meta_value != stripslashes($value) || $meta->meta_key != stripslashes($key) ) {
</ins><span class="cx"> if ( !$u = update_meta( $mid, $key, $value ) )
</span><span class="cx"> die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13488 => 13489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-02-28 06:38:15 UTC (rev 13488)
+++ trunk/wp-admin/includes/post.php 2010-02-28 07:12:05 UTC (rev 13489)
</span><span class="lines">@@ -597,8 +597,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> wp_cache_delete($post_ID, 'post_meta');
</span><del>-
- $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) );
</del><ins>+ $wpdb->insert( $wpdb->postmeta, array( 'post_id' => $post_ID, 'meta_key' => $metakey, 'meta_value' => $metavalue ) );
</ins><span class="cx"> do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, $metakey, $metavalue );
</span><span class="cx">
</span><span class="cx"> return $wpdb->insert_id;
</span><span class="lines">@@ -690,8 +689,8 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $meta_id
</span><del>- * @param unknown_type $meta_key
- * @param unknown_type $meta_value
</del><ins>+ * @param unknown_type $meta_key Expect Slashed
+ * @param unknown_type $meta_value Expect Slashed
</ins><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function update_meta( $meta_id, $meta_key, $meta_value ) {
</span><span class="lines">@@ -699,6 +698,8 @@
</span><span class="cx">
</span><span class="cx"> $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' );
</span><span class="cx">
</span><ins>+ $meta_key = stripslashes($meta_key);
+
</ins><span class="cx"> if ( in_array($meta_key, $protected) )
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13488 => 13489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-28 06:38:15 UTC (rev 13488)
+++ trunk/wp-admin/includes/template.php 2010-02-28 07:12:05 UTC (rev 13489)
</span><span class="lines">@@ -2450,8 +2450,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> foreach ( $keys as $key ) {
</span><del>- $key = esc_attr( $key );
- echo "\n<option value='" . esc_attr($key) . "'>$key</option>";
</del><ins>+ echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="lines">@@ -3289,7 +3288,7 @@
</span><span class="cx"> <?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
</span><span class="cx"> <label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
</span><span class="cx"> <input type="text" id="find-posts-input" name="ps" value="" />
</span><del>- <input type="button" onClick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
</del><ins>+ <input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
</ins><span class="cx">
</span><span class="cx"> <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
</span><span class="cx"> <label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
</span><span class="lines">@@ -3299,7 +3298,7 @@
</span><span class="cx"> <div id="find-posts-response"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="find-box-buttons">
</span><del>- <input type="button" class="button alignleft" onClick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
</del><ins>+ <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
</ins><span class="cx"> <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>