<!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>[13219] trunk/wp-includes/general-template.php:
Make better use of $wp_query->get_queried_object()
instead of duplicating its functionality.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13219">13219</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-19 10:45:29 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make better use of $wp_query->get_queried_object() instead of duplicating its functionality. See <a href="http://trac.wordpress.org/changeset/13143">[13143]</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13218 => 13219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-19 10:41:15 UTC (rev 13218)
+++ trunk/wp-includes/general-template.php 2010-02-19 10:45:29 UTC (rev 13219)
</span><span class="lines">@@ -673,18 +673,15 @@
</span><span class="cx"> */
</span><span class="cx"> function single_cat_title($prefix = '', $display = true ) {
</span><span class="cx"> global $wp_query;
</span><del>- $cat = $wp_query->queried_object;
</del><span class="cx">
</span><del>- if ( is_tag() ) {
</del><ins>+ if ( is_tag() )
</ins><span class="cx"> return single_tag_title($prefix, $display);
</span><del>- } elseif ( !empty($cat->name) ) {
- $cat = $cat->name;
- } else {
- $cat = intval( get_query_var('cat') );
- if ( !empty($cat) )
- $cat = get_the_category_by_ID($cat);
- }
- $my_cat_name = apply_filters('single_cat_title', $cat);
</del><ins>+
+ if ( !is_category() )
+ return;
+
+ $cat = $wp_query->get_queried_object();
+ $my_cat_name = apply_filters('single_cat_title', $cat->name);
</ins><span class="cx"> if ( !empty($my_cat_name) ) {
</span><span class="cx"> if ( $display )
</span><span class="cx"> echo $prefix . strip_tags($my_cat_name);
</span><span class="lines">@@ -711,23 +708,15 @@
</span><span class="cx"> * @return string|null Title when retrieving, null when displaying or failure.
</span><span class="cx"> */
</span><span class="cx"> function single_tag_title($prefix = '', $display = true ) {
</span><ins>+ global $wp_query;
</ins><span class="cx"> if ( !is_tag() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- global $wp_query;
- $tag = $wp_query->queried_object;
</del><ins>+ $tag = $wp_query->get_queried_object();;
+
+ if ( ! $tag )
+ return;
</ins><span class="cx">
</span><del>- if ( !empty($tag->name) ) {
- $tag = sanitize_term($tag, 'post_tag', 'display');
- } else {
- $tag_id = intval( get_query_var('tag_id') );
- if ( !empty($tag_id) ) {
- $tag = &get_term($tag_id, 'post_tag', OBJECT, 'display');
- if ( is_wp_error( $tag ) )
- return false;
- }
- }
-
</del><span class="cx"> $my_tag_name = apply_filters('single_tag_title', $tag->name);
</span><span class="cx"> if ( !empty($my_tag_name) ) {
</span><span class="cx"> if ( $display )
</span></span></pre>
</div>
</div>
</body>
</html>