<!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" />
<title>[22293] trunk/wp-includes/template.php: Avoid notices in get_*_template() functions that use get_queried_object(), which can return null.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22293">22293</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-25 12:54:50 +0000 (Thu, 25 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid notices in get_*_template() functions that use get_queried_object(), which can return null. Props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/20519">#20519</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestemplatephp">trunk/wp-includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/template.php (22292 => 22293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/template.php 2012-10-24 22:58:36 UTC (rev 22292)
+++ trunk/wp-includes/template.php 2012-10-25 12:54:50 UTC (rev 22293)
</span><span class="lines">@@ -82,8 +82,10 @@
</span><span class="cx">
</span><span class="cx"> $templates = array();
</span><span class="cx">
</span><del>- $templates[] = "author-{$author->user_nicename}.php";
- $templates[] = "author-{$author->ID}.php";
</del><ins>+ if ( $author ) {
+ $templates[] = "author-{$author->user_nicename}.php";
+ $templates[] = "author-{$author->ID}.php";
+ }
</ins><span class="cx"> $templates[] = 'author.php';
</span><span class="cx">
</span><span class="cx"> return get_query_template( 'author', $templates );
</span><span class="lines">@@ -106,8 +108,10 @@
</span><span class="cx">
</span><span class="cx"> $templates = array();
</span><span class="cx">
</span><del>- $templates[] = "category-{$category->slug}.php";
- $templates[] = "category-{$category->term_id}.php";
</del><ins>+ if ( $category ) {
+ $templates[] = "category-{$category->slug}.php";
+ $templates[] = "category-{$category->term_id}.php";
+ }
</ins><span class="cx"> $templates[] = 'category.php';
</span><span class="cx">
</span><span class="cx"> return get_query_template( 'category', $templates );
</span><span class="lines">@@ -130,8 +134,10 @@
</span><span class="cx">
</span><span class="cx"> $templates = array();
</span><span class="cx">
</span><del>- $templates[] = "tag-{$tag->slug}.php";
- $templates[] = "tag-{$tag->term_id}.php";
</del><ins>+ if ( $tag ) {
+ $templates[] = "tag-{$tag->slug}.php";
+ $templates[] = "tag-{$tag->term_id}.php";
+ }
</ins><span class="cx"> $templates[] = 'tag.php';
</span><span class="cx">
</span><span class="cx"> return get_query_template( 'tag', $templates );
</span><span class="lines">@@ -156,12 +162,14 @@
</span><span class="cx"> */
</span><span class="cx"> function get_taxonomy_template() {
</span><span class="cx"> $term = get_queried_object();
</span><del>- $taxonomy = $term->taxonomy;
</del><span class="cx">
</span><span class="cx"> $templates = array();
</span><span class="cx">
</span><del>- $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
- $templates[] = "taxonomy-$taxonomy.php";
</del><ins>+ if ( $term ) {
+ $taxonomy = $term->taxonomy;
+ $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
+ $templates[] = "taxonomy-$taxonomy.php";
+ }
</ins><span class="cx"> $templates[] = 'taxonomy.php';
</span><span class="cx">
</span><span class="cx"> return get_query_template( 'taxonomy', $templates );
</span><span class="lines">@@ -280,7 +288,8 @@
</span><span class="cx">
</span><span class="cx"> $templates = array();
</span><span class="cx">
</span><del>- $templates[] = "single-{$object->post_type}.php";
</del><ins>+ if ( $object )
+ $templates[] = "single-{$object->post_type}.php";
</ins><span class="cx"> $templates[] = "single.php";
</span><span class="cx">
</span><span class="cx"> return get_query_template( 'single', $templates );
</span><span class="lines">@@ -303,15 +312,21 @@
</span><span class="cx"> */
</span><span class="cx"> function get_attachment_template() {
</span><span class="cx"> global $posts;
</span><del>- $type = explode('/', $posts[0]->post_mime_type);
- if ( $template = get_query_template($type[0]) )
- return $template;
- elseif ( $template = get_query_template($type[1]) )
- return $template;
- elseif ( $template = get_query_template("$type[0]_$type[1]") )
- return $template;
- else
- return get_query_template('attachment');
</del><ins>+
+ if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
+ $type = explode( '/', $posts[0]->post_mime_type );
+
+ if ( ! empty( $type ) ) {
+ if ( $template = get_query_template( $type[0] ) )
+ return $template;
+ elseif ( $template = get_query_template( $type[1] ) )
+ return $template;
+ elseif ( $template = get_query_template( "$type[0]_$type[1]" ) )
+ return $template;
+ }
+ }
+
+ return get_query_template( 'attachment' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>