From 74eb9552bf6685834460b0eaba8a597430674049 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Wed, 21 Jan 2015 20:59:15 +0000
Subject: [PATCH] Twenty Twelve: fix escaping and minor code style issues. See
 #29127.

git-svn-id: https://develop.svn.wordpress.org/trunk@31261 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentytwelve/author.php    | 2 +-
 src/wp-content/themes/twentytwelve/functions.php | 6 ++----
 src/wp-content/themes/twentytwelve/image.php     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/wp-content/themes/twentytwelve/author.php b/src/wp-content/themes/twentytwelve/author.php
index 6570108e7e..4e95eafc22 100644
--- a/src/wp-content/themes/twentytwelve/author.php
+++ b/src/wp-content/themes/twentytwelve/author.php
@@ -29,7 +29,7 @@ get_header(); ?>
 			?>
 
 			<header class="archive-header">
-				<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
+				<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
 			</header><!-- .archive-header -->
 
 			<?php
diff --git a/src/wp-content/themes/twentytwelve/functions.php b/src/wp-content/themes/twentytwelve/functions.php
index 0b6e180b2b..a473a79175 100644
--- a/src/wp-content/themes/twentytwelve/functions.php
+++ b/src/wp-content/themes/twentytwelve/functions.php
@@ -279,14 +279,12 @@ if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
 function twentytwelve_content_nav( $html_id ) {
 	global $wp_query;
 
-	$html_id = esc_attr( $html_id );
-
 	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo $html_id; ?>" class="navigation" role="navigation">
+		<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
 			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
 			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
 			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
-		</nav><!-- #<?php echo $html_id; ?> .navigation -->
+		</nav><!-- .navigation -->
 	<?php endif;
 }
 endif;
diff --git a/src/wp-content/themes/twentytwelve/image.php b/src/wp-content/themes/twentytwelve/image.php
index 1dc2aa9312..9f3d7a25ae 100644
--- a/src/wp-content/themes/twentytwelve/image.php
+++ b/src/wp-content/themes/twentytwelve/image.php
@@ -66,7 +66,7 @@ if ( count( $attachments ) > 1 ) :
 		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
 	else :
 		// or get the URL of the first image attachment
-		$next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+		$next_attachment_url = get_attachment_link( $attachments[0]->ID );
 	endif;
 else :
 	// or, if there's only 1 image, get the URL of the image