From 0f026c38f991851ed4a213eb4d83d8121bad25d1 Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 19 Mar 2008 21:33:47 +0000
Subject: [PATCH] Do not double-mark posts as "Private" in the admin. fixes
 #3146

git-svn-id: http://svn.automattic.com/wordpress/trunk@7404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-post-rows.php   |  2 +-
 wp-includes/post-template.php | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/wp-admin/edit-post-rows.php b/wp-admin/edit-post-rows.php
index 1fce4fe365..15fba604e6 100644
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -73,7 +73,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 	case 'title':
 		?>
 		<td><strong><a class="row-title" href="post.php?action=edit&amp;post=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a></strong>
-		<?php if ('private' == $post->post_status) _e(' &#8212; <strong>Private</strong>'); ?></td>
+		<?php if ( !empty($post->post_password) ) { _e(' &#8212; <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' &#8212; <strong>Private</strong>'); } ?></td>
 		<?php
 		break;
 
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 1637d4d660..49d3c91707 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -54,11 +54,13 @@ function get_the_title( $id = 0 ) {
 	$post = &get_post($id);
 
 	$title = $post->post_title;
-	if ( !empty($post->post_password) )
-		$title = sprintf(__('Protected: %s'), $title);
-	else if ( isset($post->post_status) && 'private' == $post->post_status )
-		$title = sprintf(__('Private: %s'), $title);
 
+	if ( !is_admin() ) {
+		if ( !empty($post->post_password) )
+			$title = sprintf(__('Protected: %s'), $title);
+		else if ( isset($post->post_status) && 'private' == $post->post_status )
+			$title = sprintf(__('Private: %s'), $title);
+	}
 	return apply_filters( 'the_title', $title );
 }