ntwb / wordpress

tools/i18n/pot-ext-meta.php

Spacing +11 added lines, -11 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage tools
  */
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class PotExtMeta {
 
@@ -36,9 +36,9 @@ 
 		$source = $makepot->get_first_lines($ext_filename);
 		$pot = '';
 		$po = new PO;
-		foreach($this->headers as $header) {
+		foreach ($this->headers as $header) {
 			$string = $makepot->get_addon_header($header, $source);
-			if (!$string) continue;
+			if ( ! $string) continue;
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => $header.' of the plugin/theme',
@@ -49,16 +49,16 @@ 
 		return $pot;
 	}
 
-	function append( $ext_filename, $pot_filename, $headers = null ) {
-		if ( $headers )
+	function append($ext_filename, $pot_filename, $headers = null) {
+		if ($headers)
 			$this->headers = (array) $headers;
-		if ( is_dir( $ext_filename ) ) {
+		if (is_dir($ext_filename)) {
 			$pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
 		} else {
 			$pot = $this->load_from_file($ext_filename);
 		}
-		$potf = '-' == $pot_filename? STDOUT : fopen($pot_filename, 'a');
-		if (!$potf) return false;
+		$potf = '-' == $pot_filename ? STDOUT : fopen($pot_filename, 'a');
+		if ( ! $potf) return false;
 		fwrite($potf, $pot);
 		if ('-' != $pot_filename) fclose($potf);
 		return true;
@@ -69,10 +69,10 @@ 
 if ($included_files[0] == __FILE__) {
 	ini_set('display_errors', 1);
 	$potextmeta = new PotExtMeta;
-	if (!isset($argv[1])) {
+	if ( ! isset($argv[1])) {
 		$potextmeta->usage();
 	}
-	$potextmeta->append( $argv[1], isset( $argv[2] ) ? $argv[2] : '-', isset( $argv[3] ) ? $argv[3] : null );
+	$potextmeta->append($argv[1], isset($argv[2]) ? $argv[2] : '-', isset($argv[3]) ? $argv[3] : null);
 }
 
 ?>

tools/i18n/t/NotGettextedTest.php

Spacing +14 added lines, -14 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/not-gettexted.php';
 
 class NotGettextedTest extends PHPUnit_Framework_TestCase {
 
@@ -16,10 +16,10 @@ 
 
 	function test_make_string_aggregator() {
 		global $baba;
-		$f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
-		call_user_func( $f, 'x', 'y', 'z' );
-		call_user_func( $f, 'a', 'b', 'c' );
-		$this->assertEquals( array( array( 'x', 'y', 'baba.php', 'z'), array( 'a', 'b', 'baba.php', 'c' ) ), $baba );
+		$f = $this->ng->make_string_aggregator('baba', 'baba.php');
+		call_user_func($f, 'x', 'y', 'z');
+		call_user_func($f, 'a', 'b', 'c');
+		$this->assertEquals(array(array('x', 'y', 'baba.php', 'z'), array('a', 'b', 'baba.php', 'c')), $baba);
 	}
 
 	function test_walk() {
@@ -30,17 +30,17 @@ 
 	if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
 ?>';
 		$tokens = token_get_all($code);
-		$this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
+		$this->assertEquals('', $this->ng->walk_tokens($tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals('"yes"\'We died %d times!\'', $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
 	}
 
 	function test_replace() {
 		# copy to a new file, so that we don't corrupt the old one
-		copy( 'data/not-gettexted-0.php', 'data/not-gettexted-0-work.php' );
-		$this->ng->command_replace( 'data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php' );
-		$this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
-		unlink( 'data/not-gettexted-0-work.php' );
+		copy('data/not-gettexted-0.php', 'data/not-gettexted-0-work.php');
+		$this->ng->command_replace('data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php');
+		$this->assertEquals(file_get_contents('data/not-gettexted-0-result.php'), file_get_contents('data/not-gettexted-0-work.php'));
+		unlink('data/not-gettexted-0-work.php');
 	}
 }

src/wp-cron.php

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
 
 ignore_user_abort(true);
 
-if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+if ( ! empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON'))
 	die();
 
 /**
@@ -21,9 +21,9 @@ 
  */
 define('DOING_CRON', true);
 
-if ( !defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
 	/** Set up WordPress environment */
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
+	require_once(dirname(__FILE__).'/wp-load.php');
 }
 
 /**
@@ -40,44 +40,44 @@ 
 	global $wpdb;
 
 	$value = 0;
-	if ( wp_using_ext_object_cache() ) {
+	if (wp_using_ext_object_cache()) {
 		/*
 		 * Skip local cache and force re-fetch of doing_cron transient
 		 * in case another process updated the cache.
 		 */
-		$value = wp_cache_get( 'doing_cron', 'transient', true );
+		$value = wp_cache_get('doing_cron', 'transient', true);
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
-		if ( is_object( $row ) )
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron'));
+		if (is_object($row))
 			$value = $row->option_value;
 	}
 
 	return $value;
 }
 
-if ( false === $crons = _get_cron_array() )
+if (false === $crons = _get_cron_array())
 	die();
 
-$keys = array_keys( $crons );
-$gmt_time = microtime( true );
+$keys = array_keys($crons);
+$gmt_time = microtime(true);
 
-if ( isset($keys[0]) && $keys[0] > $gmt_time )
+if (isset($keys[0]) && $keys[0] > $gmt_time)
 	die();
 
 
 // The cron lock: a unix timestamp from when the cron was spawned.
-$doing_cron_transient = get_transient( 'doing_cron' );
+$doing_cron_transient = get_transient('doing_cron');
 
 // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
-if ( empty( $doing_wp_cron ) ) {
-	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
+if (empty($doing_wp_cron)) {
+	if (empty($_GET['doing_wp_cron'])) {
 		// Called from external script/job. Try setting a lock.
-		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
+		if ($doing_cron_transient && ($doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time))
 			return;
-		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
-		set_transient( 'doing_cron', $doing_wp_cron );
+		$doing_cron_transient = $doing_wp_cron = sprintf('%.22F', microtime(true));
+		set_transient('doing_cron', $doing_wp_cron);
 	} else {
-		$doing_wp_cron = $_GET[ 'doing_wp_cron' ];
+		$doing_wp_cron = $_GET['doing_wp_cron'];
 	}
 }
 
@@ -85,25 +85,25 @@ 
  * The cron lock (a unix timestamp set when the cron was spawned),
  * must match $doing_wp_cron (the "key").
  */
-if ( $doing_cron_transient != $doing_wp_cron )
+if ($doing_cron_transient != $doing_wp_cron)
 	return;
 
-foreach ( $crons as $timestamp => $cronhooks ) {
-	if ( $timestamp > $gmt_time )
+foreach ($crons as $timestamp => $cronhooks) {
+	if ($timestamp > $gmt_time)
 		break;
 
-	foreach ( $cronhooks as $hook => $keys ) {
+	foreach ($cronhooks as $hook => $keys) {
 
-		foreach ( $keys as $k => $v ) {
+		foreach ($keys as $k => $v) {
 
 			$schedule = $v['schedule'];
 
-			if ( $schedule != false ) {
+			if ($schedule != false) {
 				$new_args = array($timestamp, $schedule, $hook, $v['args']);
 				call_user_func_array('wp_reschedule_event', $new_args);
 			}
 
-			wp_unschedule_event( $timestamp, $hook, $v['args'] );
+			wp_unschedule_event($timestamp, $hook, $v['args']);
 
 			/**
 			 * Fires scheduled events.
@@ -114,16 +114,16 @@ 
 			 * @param string $hook Name of the hook that was scheduled to be fired.
 			 * @param array  $args The arguments to be passed to the hook.
 			 */
- 			do_action_ref_array( $hook, $v['args'] );
+ 			do_action_ref_array($hook, $v['args']);
 
 			// If the hook ran too long and another cron process stole the lock, quit.
-			if ( _get_cron_lock() != $doing_wp_cron )
+			if (_get_cron_lock() != $doing_wp_cron)
 				return;
 		}
 	}
 }
 
-if ( _get_cron_lock() == $doing_wp_cron )
-	delete_transient( 'doing_cron' );
+if (_get_cron_lock() == $doing_wp_cron)
+	delete_transient('doing_cron');
 
 die();

src/index.php

Spacing +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
 define('WP_USE_THEMES', true);
 
 /** Loads the WordPress Environment and Template */
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require(dirname(__FILE__).'/wp-blog-header.php');

src/wp-content/themes/twentytwelve/footer.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	</div><!-- #main .wrapper -->
 	<footer id="colophon" role="contentinfo">
 		<div class="site-info">
-			<?php do_action( 'twentytwelve_credits' ); ?>
-			<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
+			<?php do_action('twentytwelve_credits'); ?>
+			<a href="<?php echo esc_url(__('https://wordpress.org/', 'twentytwelve')); ?>" title="<?php esc_attr_e('Semantic Personal Publishing Platform', 'twentytwelve'); ?>"><?php printf(__('Proudly powered by %s', 'twentytwelve'), 'WordPress'); ?></a>
 		</div><!-- .site-info -->
 	</footer><!-- #colophon -->
 </div><!-- #page -->

src/wp-content/themes/twentytwelve/content-quote.php

Spacing +5 added lines, -5 removed lines

@@ -10,16 +10,16 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<div class="entry-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
+			<?php the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve')); ?>
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
-			<?php if ( comments_open() ) : ?>
+			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr(sprintf(__('Permalink to %s', 'twentytwelve'), the_title_attribute('echo=0'))); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<?php if (comments_open()) : ?>
 			<div class="comments-link">
-				<?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?>
+				<?php comments_popup_link('<span class="leave-reply">'.__('Leave a reply', 'twentytwelve').'</span>', __('1 Reply', 'twentytwelve'), __('% Replies', 'twentytwelve')); ?>
 			</div><!-- .comments-link -->
 			<?php endif; // comments_open() ?>
-			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentytwelve'), '<span class="edit-link">', '</span>'); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post -->

src/wp-content/themes/twentytwelve/image.php

Spacing +24 added lines, -24 removed lines

@@ -14,32 +14,32 @@ 
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-		<?php while ( have_posts() ) : the_post(); ?>
+		<?php while (have_posts()) : the_post(); ?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
+				<article id="post-<?php the_ID(); ?>" <?php post_class('image-attachment'); ?>>
 					<header class="entry-header">
 						<h1 class="entry-title"><?php the_title(); ?></h1>
 
 						<footer class="entry-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
-								printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
-									esc_attr( get_the_date( 'c' ) ),
-									esc_html( get_the_date() ),
-									esc_url( wp_get_attachment_url() ),
+								printf(__('<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve'),
+									esc_attr(get_the_date('c')),
+									esc_html(get_the_date()),
+									esc_url(wp_get_attachment_url()),
 									$metadata['width'],
 									$metadata['height'],
-									esc_url( get_permalink( $post->post_parent ) ),
-									esc_attr( strip_tags( get_the_title( $post->post_parent ) ) ),
-									get_the_title( $post->post_parent )
+									esc_url(get_permalink($post->post_parent)),
+									esc_attr(strip_tags(get_the_title($post->post_parent))),
+									get_the_title($post->post_parent)
 								);
 							?>
-							<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
+							<?php edit_post_link(__('Edit', 'twentytwelve'), '<span class="edit-link">', '</span>'); ?>
 						</footer><!-- .entry-meta -->
 
 						<nav id="image-navigation" class="navigation" role="navigation">
-							<span class="previous-image"><?php previous_image_link( false, __( '&larr; Previous', 'twentytwelve' ) ); ?></span>
-							<span class="next-image"><?php next_image_link( false, __( 'Next &rarr;', 'twentytwelve' ) ); ?></span>
+							<span class="previous-image"><?php previous_image_link(false, __('&larr; Previous', 'twentytwelve')); ?></span>
+							<span class="next-image"><?php next_image_link(false, __('Next &rarr;', 'twentytwelve')); ?></span>
 						</nav><!-- #image-navigation -->
 					</header><!-- .entry-header -->
 
@@ -52,28 +52,28 @@ 
  * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
  * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
  */
-$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
-foreach ( $attachments as $k => $attachment ) :
-	if ( $attachment->ID == $post->ID )
+$attachments = array_values(get_children(array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID')));
+foreach ($attachments as $k => $attachment) :
+	if ($attachment->ID == $post->ID)
 		break;
 endforeach;
 
 // If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) :
+if (count($attachments) > 1) :
 	$k++;
-	if ( isset( $attachments[ $k ] ) ) :
+	if (isset($attachments[$k])) :
 		// get the URL of the next image attachment
-		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+		$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
 	$next_attachment_url = wp_get_attachment_url();
 endif;
 ?>
-								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
+								<a href="<?php echo esc_url($next_attachment_url); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
 								/**
  								 * Filter the image attachment size to use.
 								 *
@@ -84,11 +84,11 @@ 
 								 *     @type int The attachment width in pixels.
 								 * }
 								 */
-								$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
-								echo wp_get_attachment_image( $post->ID, $attachment_size );
+								$attachment_size = apply_filters('twentytwelve_attachment_size', array(960, 960));
+								echo wp_get_attachment_image($post->ID, $attachment_size);
 								?></a>
 
-								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
+								<?php if ( ! empty($post->post_excerpt)) : ?>
 								<div class="entry-caption">
 									<?php the_excerpt(); ?>
 								</div>
@@ -99,7 +99,7 @@ 
 
 						<div class="entry-description">
 							<?php the_content(); ?>
-							<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+							<?php wp_link_pages(array('before' => '<div class="page-links">'.__('Pages:', 'twentytwelve'), 'after' => '</div>')); ?>
 						</div><!-- .entry-description -->
 
 					</div><!-- .entry-content -->

src/wp-content/themes/twentytwelve/sidebar-front.php

Spacing +5 added lines, -5 removed lines

@@ -15,21 +15,21 @@
  *
  * If none of the sidebars have widgets, then let's bail early.
  */
-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
+if ( ! is_active_sidebar('sidebar-2') && ! is_active_sidebar('sidebar-3'))
 	return;
 
 // If we get this far, we have widgets. Let do this.
 ?>
 <div id="secondary" class="widget-area" role="complementary">
-	<?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
+	<?php if (is_active_sidebar('sidebar-2')) : ?>
 	<div class="first front-widgets">
-		<?php dynamic_sidebar( 'sidebar-2' ); ?>
+		<?php dynamic_sidebar('sidebar-2'); ?>
 	</div><!-- .first -->
 	<?php endif; ?>
 
-	<?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
+	<?php if (is_active_sidebar('sidebar-3')) : ?>
 	<div class="second front-widgets">
-		<?php dynamic_sidebar( 'sidebar-3' ); ?>
+		<?php dynamic_sidebar('sidebar-3'); ?>
 	</div><!-- .second -->
 	<?php endif; ?>
 </div><!-- #secondary -->
\ No newline at end of file

src/wp-content/themes/twentytwelve/header.php

Spacing +10 added lines, -10 removed lines

@@ -19,11 +19,11 @@ 
 <html <?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
-<meta charset="<?php bloginfo( 'charset' ); ?>" />
+<meta charset="<?php bloginfo('charset'); ?>" />
 <meta name="viewport" content="width=device-width" />
-<title><?php wp_title( '|', true, 'right' ); ?></title>
+<title><?php wp_title('|', true, 'right'); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 <?php // Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions. ?>
 <!--[if lt IE 9]>
 <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
@@ -35,18 +35,18 @@ 
 <div id="page" class="hfeed site">
 	<header id="masthead" class="site-header" role="banner">
 		<hgroup>
-			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-			<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
+			<h1 class="site-title"><a href="<?php echo esc_url(home_url('/')); ?>" title="<?php echo esc_attr(get_bloginfo('name', 'display')); ?>" rel="home"><?php bloginfo('name'); ?></a></h1>
+			<h2 class="site-description"><?php bloginfo('description'); ?></h2>
 		</hgroup>
 
 		<nav id="site-navigation" class="main-navigation" role="navigation">
-			<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
-			<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
-			<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
+			<button class="menu-toggle"><?php _e('Menu', 'twentytwelve'); ?></button>
+			<a class="assistive-text" href="#content" title="<?php esc_attr_e('Skip to content', 'twentytwelve'); ?>"><?php _e('Skip to content', 'twentytwelve'); ?></a>
+			<?php wp_nav_menu(array('theme_location' => 'primary', 'menu_class' => 'nav-menu')); ?>
 		</nav><!-- #site-navigation -->
 
-		<?php if ( get_header_image() ) : ?>
-		<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php header_image(); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" /></a>
+		<?php if (get_header_image()) : ?>
+		<a href="<?php echo esc_url(home_url('/')); ?>"><img src="<?php header_image(); ?>" class="header-image" width="<?php echo esc_attr(get_custom_header()->width); ?>" height="<?php echo esc_attr(get_custom_header()->height); ?>" alt="<?php echo esc_attr(get_bloginfo('name', 'display')); ?>" /></a>
 		<?php endif; ?>
 	</header><!-- #masthead -->