<!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>[15923] trunk/wp-includes/query.php: Introduce _qv_basename()
and apply it to hierarchical taxonomies.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15923">15923</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-22 22:54:05 +0000 (Fri, 22 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce _qv_basename() and apply it to hierarchical taxonomies. See <a href="http://trac.wordpress.org/ticket/9591">#9591</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 (15922 => 15923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-22 21:31:57 UTC (rev 15922)
+++ trunk/wp-includes/query.php 2010-10-22 22:54:05 UTC (rev 15923)
</span><span class="lines">@@ -1465,7 +1465,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $t->rewrite['hierarchical'] ) {
</span><del>- $q[$t->query_var] = basename($q[$t->query_var]);
</del><ins>+ $q[$t->query_var] = $this->_qv_basename( $q[$t->query_var] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term = str_replace( ' ', '+', $q[$t->query_var] );
</span><span class="lines">@@ -1784,7 +1784,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '' != $q['name'] ) {
</span><del>- $q['name'] = sanitize_title($q['name']);
</del><ins>+ $q['name'] = sanitize_title( $q['name'] );
</ins><span class="cx"> $where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
</span><span class="cx"> } elseif ( '' != $q['pagename'] ) {
</span><span class="cx"> if ( isset($this->queried_object_id) ) {
</span><span class="lines">@@ -1812,9 +1812,7 @@
</span><span class="cx">
</span><span class="cx"> $page_for_posts = get_option('page_for_posts');
</span><span class="cx"> if ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
</span><del>- $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
- $page_paths = '/' . trim($q['pagename'], '/');
- $q['pagename'] = sanitize_title(basename($page_paths));
</del><ins>+ $q['pagename'] = sanitize_title( $this->_qv_basename( $q['pagename'] ) );
</ins><span class="cx"> $q['name'] = $q['pagename'];
</span><span class="cx"> $where .= " AND ($wpdb->posts.ID = '$reqpage')";
</span><span class="cx"> $reqpage_obj = get_page($reqpage);
</span><span class="lines">@@ -1826,9 +1824,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } elseif ( '' != $q['attachment'] ) {
</span><del>- $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
- $attach_paths = '/' . trim($q['attachment'], '/');
- $q['attachment'] = sanitize_title(basename($attach_paths));
</del><ins>+ $q['attachment'] = sanitize_title( $this->_qv_basename( $q['attachment'] ) );
</ins><span class="cx"> $q['name'] = $q['attachment'];
</span><span class="cx"> $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
</span><span class="cx"> }
</span><span class="lines">@@ -1961,7 +1957,7 @@
</span><span class="cx"> $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailling slash
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- $q['author_name'] = sanitize_title($q['author_name']);
</del><ins>+ $q['author_name'] = sanitize_title( $q['author_name'] );
</ins><span class="cx"> $q['author'] = get_user_by('slug', $q['author_name']);
</span><span class="cx"> if ( $q['author'] )
</span><span class="cx"> $q['author'] = $q['author']->ID;
</span><span class="lines">@@ -3134,6 +3130,19 @@
</span><span class="cx"> function is_404() {
</span><span class="cx"> return (bool) $this->is_404;
</span><span class="cx"> }
</span><ins>+
+ /**
+ * i18n friendly way to get the last segment in a path
+ *
+ * @since 3.1.0
+ * @access private
+ *
+ * @param string $path The path
+ * @return string
+ */
+ function _qv_basename( $path ) {
+ return basename( str_replace( '%2F', '/', urlencode( urldecode( $path ) ) ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>