<!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>[13184] trunk/wp-includes/post.php: Don'
t require a default category for post types other than 'post'.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13184">13184</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-17 20:33:29 +0000 (Wed, 17 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't require a default category for post types other than 'post'. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13183 => 13184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-17 20:25:51 UTC (rev 13183)
+++ trunk/wp-includes/post.php 2010-02-17 20:33:29 UTC (rev 13184)
</span><span class="lines">@@ -2011,12 +2011,19 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Make sure we set a valid category
</del><ins>+ if ( empty($post_type) )
+ $post_type = 'post';
+
+ // Make sure we set a valid category.
</ins><span class="cx"> if ( empty($post_category) || 0 == count($post_category) || !is_array($post_category) ) {
</span><del>- $post_category = array(get_option('default_category'));
</del><ins>+ // 'post' requires at least one category.
+ if ( 'post' == $post_type )
+ $post_category = array( get_option('default_category') );
+ else
+ $post_category = array();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- //Set the default tag list
</del><ins>+ // Set the default tag list
</ins><span class="cx"> if ( !isset($tags_input) )
</span><span class="cx"> $tags_input = array();
</span><span class="cx">
</span><span class="lines">@@ -2026,9 +2033,6 @@
</span><span class="cx"> if ( empty($post_status) )
</span><span class="cx"> $post_status = 'draft';
</span><span class="cx">
</span><del>- if ( empty($post_type) )
- $post_type = 'post';
-
</del><span class="cx"> $post_ID = 0;
</span><span class="cx">
</span><span class="cx"> // Get the post ID and GUID
</span><span class="lines">@@ -2482,14 +2486,21 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
</span><span class="cx"> $post_ID = (int) $post_ID;
</span><ins>+ $post_type = get_post_type( $post_ID );
</ins><span class="cx"> // If $post_categories isn't already an array, make it one:
</span><del>- if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories))
- $post_categories = array(get_option('default_category'));
- else if ( 1 == count($post_categories) && '' == $post_categories[0] )
</del><ins>+ if ( !is_array($post_categories) || 0 == count($post_categories) || empty($post_categories) ) {
+ if ( 'post' == $post_type )
+ $post_categories = array( get_option('default_category') );
+ else
+ $post_categories = array();
+ } else if ( 1 == count($post_categories) && '' == $post_categories[0] ) {
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><del>- $post_categories = array_map('intval', $post_categories);
- $post_categories = array_unique($post_categories);
</del><ins>+ if ( !empty($post_categories) ) {
+ $post_categories = array_map('intval', $post_categories);
+ $post_categories = array_unique($post_categories);
+ }
</ins><span class="cx">
</span><span class="cx"> return wp_set_object_terms($post_ID, $post_categories, 'category');
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>