Wordpress 3.5

[autoinstalls/wordpress.git] / wp-content / themes / twentyeleven / content-image.php

diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php
index 0c55dc74500ec04f147087c854f5d1aac12cd048..e5973f98e89d3365261035609bdb5aa76ec93be0 100644 (file)
--- a/wp-content/themes/twentyeleven/content-image.php
+++ b/wp-content/themes/twentyeleven/content-image.php
@@ -12,11 +12,11 @@
        <article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
                <header class="entry-header">
                        <hgroup>
-                               <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+                               <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
                                <h3 class="entry-format"><?php _e( 'Image', 'twentyeleven' ); ?></h3>
                        </hgroup>
 
-                       <?php if ( comments_open() ) : ?>
+                       <?php if ( comments_open() && ! post_password_required() ) : ?>
                        <div class="comments-link">
                                <?php comments_popup_link( '<span class="leave-reply">' . __( "Reply", 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                        </div>
@@ -31,12 +31,12 @@
                <footer class="entry-meta">
                        <div class="entry-meta">
                                <?php
-                                       printf( __( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s" pubdate>%3$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s" rel="author">%6$s</a></span></span>', 'twentyeleven' ),
+                                       printf( __( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s" rel="author">%6$s</a></span></span>', 'twentyeleven' ),
                                                esc_url( get_permalink() ),
                                                get_the_date( 'c' ),
                                                get_the_date(),
                                                esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-                                               sprintf( esc_attr__( 'View all posts by %s', 'twentyeleven' ), get_the_author() ),
+                                               esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
                                                get_the_author()
                                        );
                                ?>
@@ -61,10 +61,10 @@
                                <?php endif; // End if $tags_list ?>
 
                                <?php if ( comments_open() ) : ?>
-                               <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%</strong> Replies', 'twentyeleven' ) ); ?></span>
+                               <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                                <?php endif; // End if comments_open() ?>
                        </div><!-- .entry-meta -->
 
                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-               </footer><!-- #entry-meta -->
+               </footer><!-- .entry-meta -->
        </article><!-- #post-<?php the_ID(); ?> -->