Changeset 7404

Show
Ignore:
Timestamp:
03/19/08 21:33:47 (6 months ago)
Author:
markjaquith
Message:

Do not double-mark posts as "Private" in the admin. fixes #3146

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/edit-post-rows.php

    r7373 r7404  
    7474        ?> 
    7575        <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> 
    76         <?php if ('private' == $post->post_status) _e(' &#8212; <strong>Private</strong>'); ?></td> 
     76        <?php if ( !empty($post->post_password) ) { _e(' &#8212; <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' &#8212; <strong>Private</strong>'); } ?></td> 
    7777        <?php 
    7878        break; 

  • trunk/wp-includes/post-template.php

    r7263 r7404  
    5555 
    5656    $title = $post->post_title; 
    57     if ( !empty($post->post_password) ) 
    58         $title = sprintf(__('Protected: %s'), $title); 
    59     else if ( isset($post->post_status) && 'private' == $post->post_status ) 
    60         $title = sprintf(__('Private: %s'), $title); 
    61  
     57 
     58    if ( !is_admin() ) { 
     59        if ( !empty($post->post_password) ) 
     60            $title = sprintf(__('Protected: %s'), $title); 
     61        else if ( isset($post->post_status) && 'private' == $post->post_status ) 
     62            $title = sprintf(__('Private: %s'), $title); 
     63    } 
    6264    return apply_filters( 'the_title', $title ); 
    6365}