<!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>[12994] trunk: Add more visibility args to post status registration.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12994">12994</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-06 17:46:00 +0000 (Sat, 06 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add more visibility args to post status registration. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (12993 => 12994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php        2010-02-06 17:27:30 UTC (rev 12993)
+++ trunk/wp-admin/edit.php        2010-02-06 17:46:00 UTC (rev 12994)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> $class = empty($class) &amp;&amp; empty($_GET['post_status']) ? ' class=&quot;current&quot;' : '';
</span><span class="cx"> $status_links[] = &quot;&lt;li&gt;&lt;a href='edit.php?post_type=$post_type{$allposts}'$class&gt;&quot; . sprintf( _nx( 'All &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'All &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '&lt;/a&gt;';
</span><span class="cx"> 
</span><del>-foreach ( get_post_stati(array(), 'objects') as $status ) {
</del><ins>+foreach ( get_post_stati(array('show_in_admin_edit' =&gt; true), 'objects') as $status ) {
</ins><span class="cx">         $class = '';
</span><span class="cx"> 
</span><span class="cx">         $status_name = $status-&gt;name;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12993 => 12994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-02-06 17:27:30 UTC (rev 12993)
+++ trunk/wp-includes/post.php        2010-02-06 17:46:00 UTC (rev 12994)
</span><span class="lines">@@ -61,37 +61,37 @@
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'publish', array(        'label' =&gt; _x('Published', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; false,
</del><ins>+                                                                                        'public' =&gt; true,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Published &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Published &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'future', array(        'label' =&gt; _x('Scheduled', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; false,
</del><ins>+                                                                                        'public' =&gt; true,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Scheduled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Scheduled &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'draft', array(        'label' =&gt; _x('Draft', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; false,
</del><ins>+                                                                                        'public' =&gt; true,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Draft &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Drafts &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'private', array(        'label' =&gt; _x('Private', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; false,
</del><ins>+                                                                                        'public' =&gt; true,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Private &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Private &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'trash', array(        'label' =&gt; _x('Trash', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; false,
</del><ins>+                                                                                        'public' =&gt; true,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Trash &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Trash &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="cx"> 
</span><span class="cx">         register_post_status( 'auto-draft', array(        'label' =&gt; _x('Auto-Draft', 'post'),
</span><del>-                                                                                        'exclude_from_search' =&gt; true,
</del><ins>+                                                                                        'public' =&gt; false,
</ins><span class="cx">                                                                                         '_builtin' =&gt; true,
</span><span class="cx">                                                                                         'label_count' =&gt; _n_noop('Auto-Draft &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;', 'Auto-Drafts &lt;span class=&quot;count&quot;&gt;(%s)&lt;/span&gt;')
</span><span class="cx">                                                                                 ) );
</span><span class="lines">@@ -521,22 +521,31 @@
</span><span class="cx">                 $wp_post_statuses = array();
</span><span class="cx"> 
</span><span class="cx">         // Args prefixed with an underscore are reserved for internal use.
</span><del>-        $defaults = array('label' =&gt; false, 'label_count' =&gt; false, 'exclude_from_search' =&gt; true, '_builtin' =&gt; false, '_edit_link' =&gt; 'post.php?post=%d', 'capability_type' =&gt; 'post', 'hierarchical' =&gt; false, 'public' =&gt; false, '_show' =&gt; false);
</del><ins>+        $defaults = array('label' =&gt; false, 'label_count' =&gt; false, 'exclude_from_search' =&gt; null, '_builtin' =&gt; false, '_edit_link' =&gt; 'post.php?post=%d', 'capability_type' =&gt; 'post', 'hierarchical' =&gt; false, 'public' =&gt; false, 'publicly_queryable' =&gt; null, 'show_in_admin_edit' =&gt; null);
</ins><span class="cx">         $args = wp_parse_args($args, $defaults);
</span><span class="cx">         $args = (object) $args;
</span><span class="cx"> 
</span><span class="cx">         $post_status = sanitize_user($post_status, true);
</span><span class="cx">         $args-&gt;name = $post_status;
</span><span class="cx"> 
</span><ins>+        // If not set, default to the setting for public.
+        if ( null === $args-&gt;publicly_queryable )
+                $args-&gt;publicly_queryable = $args-&gt;public;
+
+        // If not set, default to true if not public, false if public.
+        if ( null === $args-&gt;exclude_from_search )
+                $args-&gt;exclude_from_search = !$args-&gt;public;
+
+        // If not set, default to the setting for public.
+        if ( null === $args-&gt;show_in_admin_edit )
+                $args-&gt;show_in_admin_edit = $args-&gt;public;
+
</ins><span class="cx">         if ( false === $args-&gt;label )
</span><span class="cx">                 $args-&gt;label = $post_status;
</span><span class="cx"> 
</span><span class="cx">         if ( false === $args-&gt;label_count )
</span><span class="cx">                 $args-&gt;label_count = $args-&gt;label;
</span><span class="cx"> 
</span><del>-        if ( !$args-&gt;_builtin &amp;&amp; $args-&gt;public )
-                $args-&gt;_show = true;
-
</del><span class="cx">         $wp_post_statuses[$post_status] = $args;
</span><span class="cx"> 
</span><span class="cx">         return $args;
</span></span></pre>
</div>
</div>

</body>
</html>