WordPress 3.5.1

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

diff --git a/wp-content/themes/twentyeleven/content-quote.php b/wp-content/themes/twentyeleven/content-quote.php
index 38541bb10654b61081b89219cf92563e7511fd8d..89a0c2947e051e271bdc97c6ed03d0e3fba18907 100644 (file)
--- a/wp-content/themes/twentyeleven/content-quote.php
+++ b/wp-content/themes/twentyeleven/content-quote.php
@@ -11,7 +11,7 @@
        <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
                <header class="entry-header">
                        <hgroup>
        <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
                <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( 'Quote', 'twentyeleven' ); ?></h3>
                        </hgroup>
 
                                <h3 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h3>
                        </hgroup>
 


@@ -19,9 +19,9 @@
                                <?php twentyeleven_posted_on(); ?>
                        </div><!-- .entry-meta -->
 
                                <?php twentyeleven_posted_on(); ?>
                        </div><!-- .entry-meta -->
 

-                       <?php if ( comments_open() ) : ?>
+                       <?php if ( comments_open() && ! post_password_required() ) : ?>

                        <div class="comments-link">
                        <div class="comments-link">

-                               <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>t
+                               <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>

                        </div>
                        <?php endif; ?>
                </header><!-- .entry-header -->
                        </div>
                        <?php endif; ?>
                </header><!-- .entry-header -->


@@ -70,5 +70,5 @@
                        <?php endif; // End if comments_open() ?>
 
                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
                        <?php endif; // End if comments_open() ?>
 
                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

-               </footer><!-- #entry-meta -->
+               </footer><!-- .entry-meta -->

        </article><!-- #post-<?php the_ID(); ?> -->
        </article><!-- #post-<?php the_ID(); ?> -->