golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't require a default category for attachment types other than 'post'. Props jfarthing84. see #9674 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-22 17:19:54 +00:00
parent a55b30dcaf
commit 1f169578f9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/post.php
View File

@ -3133,16 +3133,20 @@ function wp_insert_attachment($object, $file = false, $parent = 0) {
// export array as variables
extract($object, EXTR_SKIP);
// Make sure we set a valid category
if ( !isset($post_category) || 0 == count($post_category) || !is_array($post_category)) {
$post_category = array(get_option('default_category'));
}
if ( empty($post_author) )
$post_author = $user_ID;
$post_type = 'attachment';
$post_status = 'inherit';
// Make sure we set a valid category.
if ( !isset($post_category) || 0 == count($post_category) || !is_array($post_category) ) {
// 'post' requires at least one category.
if ( 'post' == $post_type )
$post_category = array( get_option('default_category') );
else
$post_category = array();
}
// Are we updating or creating?
if ( !empty($ID) ) {