WordPress 3.4

[autoinstalls/wordpress.git] / wp-content / themes / twentyten / loop-attachment.php

diff --git a/wp-content/themes/twentyten/loop-attachment.php b/wp-content/themes/twentyten/loop-attachment.php
index 20794fba09e2ea9ea8af398336247f08e440db6b..e775869730c4151e7905679a3968b51bb55afbdf 100644 (file)
--- a/wp-content/themes/twentyten/loop-attachment.php
+++ b/wp-content/themes/twentyten/loop-attachment.php
@@ -2,7 +2,7 @@
 /**
  * The loop that displays an attachment.
  *
- * The loop displays the posts and the post content.  See
+ * The loop displays the posts and the post content. See
  * http://codex.wordpress.org/The_Loop to understand it and
  * http://codex.wordpress.org/Template_Tags to understand
  * the tags used in it.
@@ -18,7 +18,7 @@
 <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
 
                                <?php if ( ! empty( $post->post_parent ) ) : ?>
-                                       <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+                                       <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
                                                /* translators: %s - title of parent post */
                                                printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
                                        ?></a></p>
@@ -31,9 +31,9 @@
                                                <?php
                                                        printf( __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
                                                                'meta-prep meta-prep-author',
-                                                               sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+                                                               sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
                                                                        get_author_posts_url( get_the_author_meta( 'ID' ) ),
-                                                                       sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+                                                                       esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
                                                                        get_the_author()
                                                                )
                                                        );
@@ -85,7 +85,7 @@
                $next_attachment_url = wp_get_attachment_url();
        }
 ?>
-                                               <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+                                               <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
                                                        $attachment_width  = apply_filters( 'twentyten_attachment_size', 900 );
                                                        $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
                                                        echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
@@ -96,7 +96,7 @@
                                                        <div class="nav-next"><?php next_image_link( false ); ?></div>
                                                </div><!-- #nav-below -->
 <?php else : ?>
-                                               <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+                                               <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
 <?php endif; ?>
                                                </div><!-- .entry-attachment -->
                                                <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
@@ -114,4 +114,4 @@
 
 <?php comments_template(); ?>
 
-<?php endwhile; // end of the loop. ?>
\ No newline at end of file
+<?php endwhile; // end of the loop. ?>