<!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>[16017] trunk/wp-includes/meta.php: Fix inconsistencies in metadata filters
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16017">16017</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-27 17:45:08 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix inconsistencies in metadata filters. Props sc0ttkclark. See <a href="http://trac.wordpress.org/ticket/14766">#14766</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (16016 => 16017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-10-27 17:20:46 UTC (rev 16016)
+++ trunk/wp-includes/meta.php 2010-10-27 17:45:08 UTC (rev 16017)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> // expected_slashed ($meta_key)
</span><span class="cx"> $meta_key = stripslashes($meta_key);
</span><ins>+ $meta_value = stripslashes_deep($meta_value);
</ins><span class="cx">
</span><span class="cx"> $check = apply_filters( "add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique );
</span><span class="cx"> if ( null !== $check )
</span><span class="lines">@@ -55,7 +56,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $_meta_value = $meta_value;
</span><del>- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</del><ins>+ $meta_value = maybe_serialize( $meta_value );
</ins><span class="cx">
</span><span class="cx"> do_action( "add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value );
</span><span class="cx">
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx">
</span><span class="cx"> // expected_slashed ($meta_key)
</span><span class="cx"> $meta_key = stripslashes($meta_key);
</span><ins>+ $meta_value = stripslashes_deep($meta_value);
</ins><span class="cx">
</span><span class="cx"> $check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value );
</span><span class="cx"> if ( null !== $check )
</span><span class="lines">@@ -129,7 +131,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $_meta_value = $meta_value;
</span><del>- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</del><ins>+ $meta_value = maybe_serialize( $meta_value );
</ins><span class="cx">
</span><span class="cx"> $data = compact( 'meta_value' );
</span><span class="cx"> $where = array( $column => $object_id, 'meta_key' => $meta_key );
</span><span class="lines">@@ -186,12 +188,15 @@
</span><span class="cx"> $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</span><span class="cx"> // expected_slashed ($meta_key)
</span><span class="cx"> $meta_key = stripslashes($meta_key);
</span><del>- $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</del><ins>+ $meta_value = stripslashes_deep($meta_value);
</ins><span class="cx">
</span><span class="cx"> $check = apply_filters( "delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all );
</span><span class="cx"> if ( null !== $check )
</span><span class="cx"> return (bool) $check;
</span><span class="cx">
</span><ins>+ $_meta_value = $meta_value;
+ $meta_value = maybe_serialize( $meta_value );
+
</ins><span class="cx"> $query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
</span><span class="cx">
</span><span class="cx"> if ( !$delete_all )
</span><span class="lines">@@ -204,7 +209,7 @@
</span><span class="cx"> if ( !count( $meta_ids ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $meta_value );
</del><ins>+ do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
</ins><span class="cx">
</span><span class="cx"> $query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
</span><span class="cx">
</span><span class="lines">@@ -218,7 +223,7 @@
</span><span class="cx"> if ( 'user' == $meta_type )
</span><span class="cx"> clean_user_cache($object_id);
</span><span class="cx">
</span><del>- do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $meta_value );
</del><ins>+ do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -245,12 +250,10 @@
</span><span class="cx">
</span><span class="cx"> $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
</span><span class="cx"> if ( null !== $check ) {
</span><del>- if ( !is_array( $check ) )
</del><ins>+ if ( $single && is_array( $check ) )
+ return $check[0];
+ else
</ins><span class="cx"> return $check;
</span><del>- elseif ( $single )
- return maybe_unserialize( $check[0] );
- else
- return array_map( 'maybe_unserialize', $check );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
</span></span></pre>
</div>
</div>
</body>
</html>