<!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>[15625] trunk/wp-includes/query.php:
Remove extraneous sanitization of category_name.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15625">15625</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-17 17:07:11 +0000 (Fri, 17 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove extraneous sanitization of category_name. Leave it to wp_tax_query(). See <a href="http://trac.wordpress.org/ticket/12891">#12891</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15624 => 15625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-09-17 16:08:35 UTC (rev 15624)
+++ trunk/wp-includes/query.php 2010-09-17 17:07:11 UTC (rev 15625)
</span><span class="lines">@@ -1877,35 +1877,14 @@
</span><span class="cx">
</span><span class="cx"> // Category stuff for nice URLs
</span><span class="cx"> if ( '' != $q['category_name'] && !$this->is_singular ) {
</span><del>- $q['category_name'] = implode('/', array_map('sanitize_title', explode('/', $q['category_name'])));
- $reqcat = get_category_by_path($q['category_name']);
- $q['category_name'] = str_replace('%2F', '/', urlencode(urldecode($q['category_name'])));
- $cat_paths = '/' . trim($q['category_name'], '/');
- $q['category_name'] = sanitize_title(basename($cat_paths));
</del><ins>+ $q['category_name'] = str_replace( '%2F', '/', urlencode(urldecode($q['category_name'])) );
+ $q['category_name'] = '/' . trim( $q['category_name'], '/' );
</ins><span class="cx">
</span><del>- $cat_paths = '/' . trim(urldecode($q['category_name']), '/');
- $q['category_name'] = sanitize_title(basename($cat_paths));
- $cat_paths = explode('/', $cat_paths);
- $cat_path = '';
- foreach ( (array) $cat_paths as $pathdir )
- $cat_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
-
- //if we don't match the entire hierarchy fallback on just matching the nicename
- if ( empty($reqcat) )
- $reqcat = get_category_by_path($q['category_name'], false);
-
- if ( !empty($reqcat) )
- $reqcat = $reqcat->term_id;
- else
- $reqcat = 0;
-
- $q['cat'] = $reqcat;
-
</del><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><del>- 'terms' => array( $q['cat'] ),
</del><ins>+ 'terms' => array( basename( $q['category_name'] ) ),
</ins><span class="cx"> 'operator' => 'IN',
</span><del>- 'field' => 'term_id'
</del><ins>+ 'field' => 'slug'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>