<!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>[15635] trunk/wp-includes: Simplify sanitize_key()
and use it in more places.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15635">15635</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-09-20 15:28:58 +0000 (Mon, 20 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify sanitize_key() and use it in more places. see <a href="http://trac.wordpress.org/ticket/14910">#14910</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (15634 => 15635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-09-19 11:08:20 UTC (rev 15634)
+++ trunk/wp-includes/formatting.php 2010-09-20 15:28:58 UTC (rev 15635)
</span><span class="lines">@@ -763,10 +763,6 @@
</span><span class="cx"> */
</span><span class="cx"> function sanitize_key( $key ) {
</span><span class="cx"> $raw_key = $key;
</span><del>- $key = wp_strip_all_tags($key);
- // Kill octets
- $key = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $key);
- $key = preg_replace('/&.+?;/', '', $key); // Kill entities
</del><span class="cx">
</span><span class="cx"> $key = preg_replace('|[^a-z0-9 _.\-@]|i', '', $key);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15634 => 15635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-09-19 11:08:20 UTC (rev 15634)
+++ trunk/wp-includes/post.php 2010-09-20 15:28:58 UTC (rev 15635)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args = (object) $args;
</span><span class="cx">
</span><del>- $post_status = sanitize_user($post_status, true);
</del><ins>+ $post_status = sanitize_key($post_status);
</ins><span class="cx"> $args->name = $post_status;
</span><span class="cx">
</span><span class="cx"> if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
</span><span class="lines">@@ -819,7 +819,7 @@
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args = (object) $args;
</span><span class="cx">
</span><del>- $post_type = sanitize_user($post_type, true);
</del><ins>+ $post_type = sanitize_key($post_type);
</ins><span class="cx"> $args->name = $post_type;
</span><span class="cx">
</span><span class="cx"> // If not set, default to the setting for public.
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15634 => 15635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-09-19 11:08:20 UTC (rev 15634)
+++ trunk/wp-includes/query.php 2010-09-20 15:28:58 UTC (rev 15635)
</span><span class="lines">@@ -1456,9 +1456,9 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty($qv['post_type']) ) {
</span><span class="cx"> if ( is_array($qv['post_type']) )
</span><del>- $qv['post_type'] = array_map('sanitize_user', $qv['post_type'], array(true));
</del><ins>+ $qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
</ins><span class="cx"> else
</span><del>- $qv['post_type'] = sanitize_user($qv['post_type'], true);
</del><ins>+ $qv['post_type'] = sanitize_key($qv['post_type']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($qv['post_status']) )
</span></span></pre>
</div>
</div>
</body>
</html>