From 251a2ffa0c4d1b9b03065c94a726dfdee3c78d39 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 16 Feb 2008 16:24:52 +0000
Subject: [PATCH] Make sure we can publish private posts. Fixes #5881, #4206.

git-svn-id: http://svn.automattic.com/wordpress/trunk@6872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/post.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 25c8590a56..e4b54ab674 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -56,7 +56,7 @@ function edit_post() {
 		$_POST['post_status'] = 'draft';
 	if ('' != $_POST['saveasprivate'] )
 		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'] )
+	if ( ( '' != $_POST['publish'] ) && ( $_POST['post_status'] != 'private' ) )
 		$_POST['post_status'] = 'publish';
 	if ('' != $_POST['advanced'] )
 		$_POST['post_status'] = 'draft';
@@ -254,7 +254,7 @@ function wp_write_post() {
 		$_POST['post_status'] = 'draft';
 	if ('' != $_POST['saveasprivate'] )
 		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'] )
+	if ( ( '' != $_POST['publish'] ) && ( $_POST['post_status'] != 'private' ) )
 		$_POST['post_status'] = 'publish';
 	if ('' != $_POST['advanced'] )
 		$_POST['post_status'] = 'draft';