<!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>[14887] trunk/wp-includes/query.php:
Give is_singular the ability to provide awareness/
context for custom post types.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14887">14887</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-25 15:36:23 +0000 (Tue, 25 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give is_singular the ability to provide awareness/context for custom post types. props ryan, scribu. Usage: is_singular('book') or is_singular( array( 'newspapers', 'books' ) ). fixes <a href="http://trac.wordpress.org/ticket/12588">#12588</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 (14886 => 14887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-05-25 15:32:57 UTC (rev 14886)
+++ trunk/wp-includes/query.php 2010-05-25 15:36:23 UTC (rev 14887)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> * @param string|int $author Optional. Is current page this author.
</span><span class="cx"> * @return bool True if page is author or $author (if set).
</span><span class="cx"> */
</span><del>-function is_author ($author = '') {
</del><ins>+function is_author($author = '') {
</ins><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="cx"> if ( !$wp_query->is_author )
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> * @param string|array $category Optional.
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function is_category ($category = '') {
</del><ins>+function is_category($category = '') {
</ins><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="cx"> if ( !$wp_query->is_category )
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> * @param mixed $page Either page or list of pages to test against.
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function is_page ($page = '') {
</del><ins>+function is_page($page = '') {
</ins><span class="cx"> global $wp_query;
</span><span class="cx">
</span><span class="cx"> if ( !$wp_query->is_page )
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> if ( !$wp_query->is_single )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty( $post) )
</del><ins>+ if ( empty($post) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> $post_obj = $wp_query->get_queried_object();
</span><span class="lines">@@ -552,12 +552,18 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @uses $wp_query
</span><span class="cx"> *
</span><ins>+ * @param string|array $post_types Optional. Post type or types to check in current query.
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function is_singular() {
</del><ins>+function is_singular($post_types = '') {
</ins><span class="cx"> global $wp_query;
</span><span class="cx">
</span><del>- return $wp_query->is_singular;
</del><ins>+ if ( empty($post_types) || !$wp_query->is_singular )
+ return $wp_query->is_singular;
+
+ $post_obj = $wp_query->get_queried_object();
+
+ return in_array($post_obj->post_type, (array) $post_types);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1237,7 +1243,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $query
</span><span class="cx"> */
</span><del>- function parse_query($query ) {
</del><ins>+ function parse_query($query) {
</ins><span class="cx"> if ( !empty($query) || !isset($this->query) ) {
</span><span class="cx"> $this->init();
</span><span class="cx"> if ( is_array($query) )
</span></span></pre>
</div>
</div>
</body>
</html>