ntwb / wordpress

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

Spacing +20 added lines, -20 removed lines

@@ -11,34 +11,34 @@ 
  * @since Twenty Eleven 1.0
  */
 ?>
-	<article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
+	<article id="post-<?php the_ID(); ?>" <?php post_class('indexed'); ?>>
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Image', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php _e('Image', 'twentyeleven'); ?></h3>
 			</hgroup>
 
-			<?php if ( comments_open() && ! post_password_required() ) : ?>
+			<?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' ) ); ?>
+				<?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 class="entry-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?>
+			<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
 			<div class="entry-meta">
 				<?php
-					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' ),
+					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' ) ) ),
-						esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+						esc_url(get_author_posts_url(get_the_author_meta('ID'))),
+						esc_attr(sprintf(__('View all posts by %s', 'twentyeleven'), get_the_author())),
 						get_the_author()
 					);
 				?>
@@ -46,27 +46,27 @@ 
 			<div class="entry-meta">
 				<?php
 					/* translators: used between list items, there is a space after the comma */
-					$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-					if ( $categories_list ):
+					$categories_list = get_the_category_list(__(', ', 'twentyeleven'));
+					if ($categories_list):
 				?>
 				<span class="cat-links">
-					<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+					<?php printf(__('<span class="%1$s">Posted in</span> %2$s', 'twentyeleven'), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list); ?>
 				</span>
 				<?php endif; // End if categories ?>
 				<?php
 					/* translators: used between list items, there is a space after the comma */
-					$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-					if ( $tags_list ): ?>
+					$tags_list = get_the_tag_list('', __(', ', 'twentyeleven'));
+					if ($tags_list): ?>
 				<span class="tag-links">
-					<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+					<?php printf(__('<span class="%1$s">Tagged</span> %2$s', 'twentyeleven'), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list); ?>
 				</span>
 				<?php endif; // End if $tags_list ?>
 
-				<?php if ( comments_open() ) : ?>
-				<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 if (comments_open()) : ?>
+				<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>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post-<?php the_ID(); ?> -->

src/wp-content/themes/twentyeleven/search.php

Spacing +8 added lines, -8 removed lines

@@ -12,16 +12,16 @@ 
 		<section id="primary">
 			<div id="content" role="main">
 
-			<?php if ( have_posts() ) : ?>
+			<?php if (have_posts()) : ?>
 
 				<header class="page-header">
-					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyeleven' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+					<h1 class="page-title"><?php printf(__('Search Results for: %s', 'twentyeleven'), '<span>'.get_search_query().'</span>'); ?></h1>
 				</header>
 
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+				<?php twentyeleven_content_nav('nav-above'); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
 					<?php
 						/*
@@ -30,22 +30,22 @@ 
 						 * called content-___.php (where ___ is the Post Format name) and that
 						 * will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 					?>
 
 				<?php endwhile; ?>
 
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+				<?php twentyeleven_content_nav('nav-below'); ?>
 
 			<?php else : ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e('Nothing Found', 'twentyeleven'); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven' ); ?></p>
+						<p><?php _e('Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven'); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->

Braces +5 added lines, -2 removed lines

@@ -30,11 +30,14 @@
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' );
+}
+?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">

src/wp-content/themes/twentyeleven/sidebar-footer.php

Spacing +9 added lines, -9 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -18,8 +18,9 @@
 	if (   ! is_active_sidebar( 'sidebar-3'  )
 		&& ! is_active_sidebar( 'sidebar-4' )
 		&& ! is_active_sidebar( 'sidebar-5'  )
-	)
-		return;
+	) {
+			return;
+	}
 	// If we get this far, we have widgets. Let do this.
 ?>
 <div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>

src/wp-content/themes/twentyeleven/tag.php

Spacing +10 added lines, -10 removed lines

@@ -12,16 +12,16 @@ 
 		<section id="primary">
 			<div id="content" role="main">
 
-			<?php if ( have_posts() ) : ?>
+			<?php if (have_posts()) : ?>
 
 				<header class="page-header">
 					<h1 class="page-title"><?php
-						printf( __( 'Tag Archives: %s', 'twentyeleven' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+						printf(__('Tag Archives: %s', 'twentyeleven'), '<span>'.single_tag_title('', false).'</span>');
 					?></h1>
 
 					<?php
 						$tag_description = tag_description();
-						if ( ! empty( $tag_description ) ) {
+						if ( ! empty($tag_description)) {
 							/**
 							 * Filter the default Twenty Eleven tag description.
 							 *
@@ -29,15 +29,15 @@ 
 							 *
 							 * @param string The default tag description.
 							 */
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+							echo apply_filters('tag_archive_meta', '<div class="tag-archive-meta">'.$tag_description.'</div>');
 						}
 					?>
 				</header>
 
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+				<?php twentyeleven_content_nav('nav-above'); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
 					<?php
 						/*
@@ -46,22 +46,22 @@ 
 						 * called content-___.php (where ___ is the Post Format name) and that
 						 * will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 					?>
 
 				<?php endwhile; ?>
 
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+				<?php twentyeleven_content_nav('nav-below'); ?>
 
 			<?php else : ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e('Nothing Found', 'twentyeleven'); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php _e('Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven'); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->

Braces +5 added lines, -2 removed lines

@@ -30,11 +30,14 @@
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' );
+}
+?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">

src/wp-content/themes/twentyeleven/content-single.php

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
 	<header class="entry-header">
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 
-		<?php if ( 'post' == get_post_type() ) : ?>
+		<?php if ('post' == get_post_type()) : ?>
 		<div class="entry-meta">
 			<?php twentyeleven_posted_on(); ?>
 		</div><!-- .entry-meta -->
@@ -21,50 +21,50 @@ 
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
 		<?php
 			/* translators: used between list items, there is a space after the comma */
-			$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+			$categories_list = get_the_category_list(__(', ', 'twentyeleven'));
 
 			/* translators: used between list items, there is a space after the comma */
-			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			if ( '' != $tag_list ) {
-				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			} elseif ( '' != $categories_list ) {
-				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+			$tag_list = get_the_tag_list('', __(', ', 'twentyeleven'));
+			if ('' != $tag_list) {
+				$utility_text = __('This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven');
+			} elseif ('' != $categories_list) {
+				$utility_text = __('This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven');
 			} else {
-				$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+				$utility_text = __('This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven');
 			}
 
 			printf(
 				$utility_text,
 				$categories_list,
 				$tag_list,
-				esc_url( get_permalink() ),
-				the_title_attribute( 'echo=0' ),
+				esc_url(get_permalink()),
+				the_title_attribute('echo=0'),
 				get_the_author(),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
+				esc_url(get_author_posts_url(get_the_author_meta('ID')))
 			);
 		?>
-		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 
-		<?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
+		<?php if (get_the_author_meta('description') && ( ! function_exists('is_multi_author') || is_multi_author())) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
 		<div id="author-info">
 			<div id="author-avatar">
 				<?php
 				/** This filter is documented in author.php */
-				echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 68 ) );
+				echo get_avatar(get_the_author_meta('user_email'), apply_filters('twentyeleven_author_bio_avatar_size', 68));
 				?>
 			</div><!-- #author-avatar -->
 			<div id="author-description">
-				<h2><?php printf( __( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
-				<?php the_author_meta( 'description' ); ?>
+				<h2><?php printf(__('About %s', 'twentyeleven'), get_the_author()); ?></h2>
+				<?php the_author_meta('description'); ?>
 				<div id="author-link">
-					<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-						<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyeleven' ), get_the_author() ); ?>
+					<a href="<?php echo esc_url(get_author_posts_url(get_the_author_meta('ID'))); ?>" rel="author">
+						<?php printf(__('View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyeleven'), get_the_author()); ?>
 					</a>
 				</div><!-- #author-link	-->
 			</div><!-- #author-description -->

src/wp-content/themes/twentyeleven/inc/theme-options.php

Braces +38 added lines, -28 removed lines

@@ -99,8 +99,9 @@ 
 		'twentyeleven_theme_options_render_page' // Function that renders the options page
 	);
 
-	if ( ! $theme_page )
-		return;
+	if ( ! $theme_page ) {
+			return;
+	}
 
 	add_action( "load-$theme_page", 'twentyeleven_theme_options_help' );
 }
@@ -217,8 +218,9 @@ 
 		'theme_layout' => 'content-sidebar',
 	);
 
-	if ( is_rtl() )
-		$default_theme_options['theme_layout'] = 'sidebar-content';
+	if ( is_rtl() ) {
+			$default_theme_options['theme_layout'] = 'sidebar-content';
+	}
 
 	/**
 	 * Filter the Twenty Eleven default options.
@@ -246,8 +248,9 @@ 
 	}
 
 	$color_schemes = twentyeleven_color_schemes();
-	if ( ! isset( $color_schemes[ $color_scheme ] ) )
-		return false;
+	if ( ! isset( $color_schemes[ $color_scheme ] ) ) {
+			return false;
+	}
 
 	return $color_schemes[ $color_scheme ]['default_link_color'];
 }
@@ -364,19 +367,22 @@ 
 	$output = $defaults = twentyeleven_get_default_theme_options();
 
 	// Color scheme must be in our array of color scheme options
-	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
-		$output['color_scheme'] = $input['color_scheme'];
+	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) ) {
+			$output['color_scheme'] = $input['color_scheme'];
+	}
 
 	// Our defaults for the link color may have changed, based on the color scheme.
 	$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
 
 	// Link color must be 3 or 6 hexadecimal characters
-	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
-		$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
+	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) ) {
+			$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
+	}
 
 	// Theme layout must be in our array of theme layout options
-	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
-		$output['theme_layout'] = $input['theme_layout'];
+	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) ) {
+			$output['theme_layout'] = $input['theme_layout'];
+	}
 
 	/**
 	 * Filter the Twenty Eleven sanitized form input array.
@@ -399,8 +405,9 @@ 
 	$options = twentyeleven_get_theme_options();
 	$color_scheme = $options['color_scheme'];
 
-	if ( 'dark' == $color_scheme )
-		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+	if ( 'dark' == $color_scheme ) {
+			wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+	}
 
 	/**
 	 * Fires after the styles for the Twenty Eleven color scheme are enqueued.
@@ -427,9 +434,10 @@ 
 	$default_options = twentyeleven_get_default_theme_options();
 
 	// Don't do anything if the current link color is the default.
-	if ( $default_options['link_color'] == $link_color )
-		return;
-?>
+	if ( $default_options['link_color'] == $link_color ) {
+			return;
+	}
+	?>
 	<style>
 		/* Link color */
 		a,
@@ -472,17 +480,19 @@ 
 	$options = twentyeleven_get_theme_options();
 	$current_layout = $options['theme_layout'];
 
-	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
-		$classes = array( 'two-column' );
-	else
-		$classes = array( 'one-column' );
-
-	if ( 'content-sidebar' == $current_layout )
-		$classes[] = 'right-sidebar';
-	elseif ( 'sidebar-content' == $current_layout )
-		$classes[] = 'left-sidebar';
-	else
-		$classes[] = $current_layout;
+	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) ) {
+			$classes = array( 'two-column' );
+	} else {
+			$classes = array( 'one-column' );
+	}
+
+	if ( 'content-sidebar' == $current_layout ) {
+			$classes[] = 'right-sidebar';
+	} elseif ( 'sidebar-content' == $current_layout ) {
+			$classes[] = 'left-sidebar';
+	} else {
+			$classes[] = $current_layout;
+	}
 
 	/**
 	 * Filter the Twenty Eleven layout body classes.

Spacing +130 added lines, -130 removed lines

@@ -16,12 +16,12 @@ 
  *
  * @param string $hook_suffix An admin page's hook suffix.
  */
-function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
-	wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
-	wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
-	wp_enqueue_style( 'farbtastic' );
+function twentyeleven_admin_enqueue_scripts($hook_suffix) {
+	wp_enqueue_style('twentyeleven-theme-options', get_template_directory_uri().'/inc/theme-options.css', false, '2011-04-28');
+	wp_enqueue_script('twentyeleven-theme-options', get_template_directory_uri().'/inc/theme-options.js', array('farbtastic'), '2011-06-10');
+	wp_enqueue_style('farbtastic');
 }
-add_action( 'admin_print_styles-appearance_page_theme_options', 'twentyeleven_admin_enqueue_scripts' );
+add_action('admin_print_styles-appearance_page_theme_options', 'twentyeleven_admin_enqueue_scripts');
 
 /**
  * Register the form setting for our twentyeleven_options array.
@@ -37,7 +37,7 @@ 
 function twentyeleven_theme_options_init() {
 
 	register_setting(
-		'twentyeleven_options',       // Options group, see settings_fields() call in twentyeleven_theme_options_render_page()
+		'twentyeleven_options', // Options group, see settings_fields() call in twentyeleven_theme_options_render_page()
 		'twentyeleven_theme_options', // Database option, see twentyeleven_get_theme_options()
 		'twentyeleven_theme_options_validate' // The sanitization callback, see twentyeleven_theme_options_validate()
 	);
@@ -52,17 +52,17 @@ 
 
 	// Register our individual settings fields
 	add_settings_field(
-		'color_scheme',                             // Unique identifier for the field for this section
-		__( 'Color Scheme', 'twentyeleven' ),       // Setting field label
+		'color_scheme', // Unique identifier for the field for this section
+		__('Color Scheme', 'twentyeleven'), // Setting field label
 		'twentyeleven_settings_field_color_scheme', // Function that renders the settings field
-		'theme_options',                            // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
+		'theme_options', // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page()
 		'general'                                   // Settings section. Same as the first argument in the add_settings_section() above
 	);
 
-	add_settings_field( 'link_color', __( 'Link Color',     'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
-	add_settings_field( 'layout',     __( 'Default Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout',     'theme_options', 'general' );
+	add_settings_field('link_color', __('Link Color', 'twentyeleven'), 'twentyeleven_settings_field_link_color', 'theme_options', 'general');
+	add_settings_field('layout', __('Default Layout', 'twentyeleven'), 'twentyeleven_settings_field_layout', 'theme_options', 'general');
 }
-add_action( 'admin_init', 'twentyeleven_theme_options_init' );
+add_action('admin_init', 'twentyeleven_theme_options_init');
 
 /**
  * Change the capability required to save the 'twentyeleven_options' options group.
@@ -78,10 +78,10 @@ 
  * @param string $capability The capability used for the page, which is manage_options by default.
  * @return string The capability to actually use.
  */
-function twentyeleven_option_page_capability( $capability ) {
+function twentyeleven_option_page_capability($capability) {
 	return 'edit_theme_options';
 }
-add_filter( 'option_page_capability_twentyeleven_options', 'twentyeleven_option_page_capability' );
+add_filter('option_page_capability_twentyeleven_options', 'twentyeleven_option_page_capability');
 
 /**
  * Add a theme options page to the admin menu, including some help documentation.
@@ -92,49 +92,49 @@ 
  */
 function twentyeleven_theme_options_add_page() {
 	$theme_page = add_theme_page(
-		__( 'Theme Options', 'twentyeleven' ),   // Name of page
-		__( 'Theme Options', 'twentyeleven' ),   // Label in menu
-		'edit_theme_options',                    // Capability required
-		'theme_options',                         // Menu slug, used to uniquely identify the page
+		__('Theme Options', 'twentyeleven'), // Name of page
+		__('Theme Options', 'twentyeleven'), // Label in menu
+		'edit_theme_options', // Capability required
+		'theme_options', // Menu slug, used to uniquely identify the page
 		'twentyeleven_theme_options_render_page' // Function that renders the options page
 	);
 
-	if ( ! $theme_page )
+	if ( ! $theme_page)
 		return;
 
-	add_action( "load-$theme_page", 'twentyeleven_theme_options_help' );
+	add_action("load-$theme_page", 'twentyeleven_theme_options_help');
 }
-add_action( 'admin_menu', 'twentyeleven_theme_options_add_page' );
+add_action('admin_menu', 'twentyeleven_theme_options_add_page');
 
 function twentyeleven_theme_options_help() {
 
-	$help = '<p>' . __( 'Some themes provide customization options that are grouped together on a Theme Options screen. If you change themes, options may change or disappear, as they are theme-specific. Your current theme, Twenty Eleven, provides the following Theme Options:', 'twentyeleven' ) . '</p>' .
-			'<ol>' .
-				'<li>' . __( '<strong>Color Scheme</strong>: You can choose a color palette of "Light" (light background with dark text) or "Dark" (dark background with light text) for your site.', 'twentyeleven' ) . '</li>' .
-				'<li>' . __( '<strong>Link Color</strong>: You can choose the color used for text links on your site. You can enter the HTML color or hex code, or you can choose visually by clicking the "Select a Color" button to pick from a color wheel.', 'twentyeleven' ) . '</li>' .
-				'<li>' . __( '<strong>Default Layout</strong>: You can choose if you want your site&#8217;s default layout to have a sidebar on the left, the right, or not at all.', 'twentyeleven' ) . '</li>' .
-			'</ol>' .
-			'<p>' . __( 'Remember to click "Save Changes" to save any changes you have made to the theme options.', 'twentyeleven' ) . '</p>';
+	$help = '<p>'.__('Some themes provide customization options that are grouped together on a Theme Options screen. If you change themes, options may change or disappear, as they are theme-specific. Your current theme, Twenty Eleven, provides the following Theme Options:', 'twentyeleven').'</p>'.
+			'<ol>'.
+				'<li>'.__('<strong>Color Scheme</strong>: You can choose a color palette of "Light" (light background with dark text) or "Dark" (dark background with light text) for your site.', 'twentyeleven').'</li>'.
+				'<li>'.__('<strong>Link Color</strong>: You can choose the color used for text links on your site. You can enter the HTML color or hex code, or you can choose visually by clicking the "Select a Color" button to pick from a color wheel.', 'twentyeleven').'</li>'.
+				'<li>'.__('<strong>Default Layout</strong>: You can choose if you want your site&#8217;s default layout to have a sidebar on the left, the right, or not at all.', 'twentyeleven').'</li>'.
+			'</ol>'.
+			'<p>'.__('Remember to click "Save Changes" to save any changes you have made to the theme options.', 'twentyeleven').'</p>';
 
-	$sidebar = '<p><strong>' . __( 'For more information:', 'twentyeleven' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Theme_Options_Screen" target="_blank">Documentation on Theme Options</a>', 'twentyeleven' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>', 'twentyeleven' ) . '</p>';
+	$sidebar = '<p><strong>'.__('For more information:', 'twentyeleven').'</strong></p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Theme_Options_Screen" target="_blank">Documentation on Theme Options</a>', 'twentyeleven').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>', 'twentyeleven').'</p>';
 
 	$screen = get_current_screen();
 
-	if ( method_exists( $screen, 'add_help_tab' ) ) {
+	if (method_exists($screen, 'add_help_tab')) {
 		// WordPress 3.3.0
-		$screen->add_help_tab( array(
-			'title' => __( 'Overview', 'twentyeleven' ),
+		$screen->add_help_tab(array(
+			'title' => __('Overview', 'twentyeleven'),
 			'id' => 'theme-options-help',
 			'content' => $help,
 			)
 		);
 
-		$screen->set_help_sidebar( $sidebar );
+		$screen->set_help_sidebar($sidebar);
 	} else {
 		// WordPress 3.2.0
-		add_contextual_help( $screen, $help . $sidebar );
+		add_contextual_help($screen, $help.$sidebar);
 	}
 }
 
@@ -147,14 +147,14 @@ 
 	$color_scheme_options = array(
 		'light' => array(
 			'value' => 'light',
-			'label' => __( 'Light', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/light.png',
+			'label' => __('Light', 'twentyeleven'),
+			'thumbnail' => get_template_directory_uri().'/inc/images/light.png',
 			'default_link_color' => '#1b8be0',
 		),
 		'dark' => array(
 			'value' => 'dark',
-			'label' => __( 'Dark', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png',
+			'label' => __('Dark', 'twentyeleven'),
+			'thumbnail' => get_template_directory_uri().'/inc/images/dark.png',
 			'default_link_color' => '#e4741f',
 		),
 	);
@@ -166,7 +166,7 @@ 
 	 *
 	 * @param array $color_scheme_options An associative array of color scheme options.
 	 */
-	return apply_filters( 'twentyeleven_color_schemes', $color_scheme_options );
+	return apply_filters('twentyeleven_color_schemes', $color_scheme_options);
 }
 
 /**
@@ -178,18 +178,18 @@ 
 	$layout_options = array(
 		'content-sidebar' => array(
 			'value' => 'content-sidebar',
-			'label' => __( 'Content on left', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/content-sidebar.png',
+			'label' => __('Content on left', 'twentyeleven'),
+			'thumbnail' => get_template_directory_uri().'/inc/images/content-sidebar.png',
 		),
 		'sidebar-content' => array(
 			'value' => 'sidebar-content',
-			'label' => __( 'Content on right', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/sidebar-content.png',
+			'label' => __('Content on right', 'twentyeleven'),
+			'thumbnail' => get_template_directory_uri().'/inc/images/sidebar-content.png',
 		),
 		'content' => array(
 			'value' => 'content',
-			'label' => __( 'One-column, no sidebar', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/content.png',
+			'label' => __('One-column, no sidebar', 'twentyeleven'),
+			'thumbnail' => get_template_directory_uri().'/inc/images/content.png',
 		),
 	);
 
@@ -200,7 +200,7 @@ 
 	 *
 	 * @param array $layout_options An associative array of layout options.
 	 */
-	return apply_filters( 'twentyeleven_layouts', $layout_options );
+	return apply_filters('twentyeleven_layouts', $layout_options);
 }
 
 /**
@@ -213,11 +213,11 @@ 
 function twentyeleven_get_default_theme_options() {
 	$default_theme_options = array(
 		'color_scheme' => 'light',
-		'link_color'   => twentyeleven_get_default_link_color( 'light' ),
+		'link_color'   => twentyeleven_get_default_link_color('light'),
 		'theme_layout' => 'content-sidebar',
 	);
 
-	if ( is_rtl() )
+	if (is_rtl())
 		$default_theme_options['theme_layout'] = 'sidebar-content';
 
 	/**
@@ -227,7 +227,7 @@ 
 	 *
 	 * @param array $default_theme_options An array of default theme options.
 	 */
-	return apply_filters( 'twentyeleven_default_theme_options', $default_theme_options );
+	return apply_filters('twentyeleven_default_theme_options', $default_theme_options);
 }
 
 /**
@@ -239,17 +239,17 @@ 
  *                             Default null (or the active color scheme).
  * @return string The default link color.
 */
-function twentyeleven_get_default_link_color( $color_scheme = null ) {
-	if ( null === $color_scheme ) {
+function twentyeleven_get_default_link_color($color_scheme = null) {
+	if (null === $color_scheme) {
 		$options = twentyeleven_get_theme_options();
 		$color_scheme = $options['color_scheme'];
 	}
 
 	$color_schemes = twentyeleven_color_schemes();
-	if ( ! isset( $color_schemes[ $color_scheme ] ) )
+	if ( ! isset($color_schemes[$color_scheme]))
 		return false;
 
-	return $color_schemes[ $color_scheme ]['default_link_color'];
+	return $color_schemes[$color_scheme]['default_link_color'];
 }
 
 /**
@@ -258,7 +258,7 @@ 
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_get_theme_options() {
-	return get_option( 'twentyeleven_theme_options', twentyeleven_get_default_theme_options() );
+	return get_option('twentyeleven_theme_options', twentyeleven_get_default_theme_options());
 }
 
 /**
@@ -269,15 +269,15 @@ 
 function twentyeleven_settings_field_color_scheme() {
 	$options = twentyeleven_get_theme_options();
 
-	foreach ( twentyeleven_color_schemes() as $scheme ) {
+	foreach (twentyeleven_color_schemes() as $scheme) {
 	?>
 	<div class="layout image-radio-option color-scheme">
 	<label class="description">
-		<input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $scheme['value'] ); ?>" <?php checked( $options['color_scheme'], $scheme['value'] ); ?> />
-		<input type="hidden" id="default-color-<?php echo esc_attr( $scheme['value'] ); ?>" value="<?php echo esc_attr( $scheme['default_link_color'] ); ?>" />
+		<input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr($scheme['value']); ?>" <?php checked($options['color_scheme'], $scheme['value']); ?> />
+		<input type="hidden" id="default-color-<?php echo esc_attr($scheme['value']); ?>" value="<?php echo esc_attr($scheme['default_link_color']); ?>" />
 		<span>
-			<img src="<?php echo esc_url( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
-			<?php echo esc_html( $scheme['label'] ); ?>
+			<img src="<?php echo esc_url($scheme['thumbnail']); ?>" width="136" height="122" alt="" />
+			<?php echo esc_html($scheme['label']); ?>
 		</span>
 	</label>
 	</div>
@@ -293,12 +293,12 @@ 
 function twentyeleven_settings_field_link_color() {
 	$options = twentyeleven_get_theme_options();
 	?>
-	<input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
+	<input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr($options['link_color']); ?>" />
 	<a href="#" class="pickcolor hide-if-no-js" id="link-color-example"></a>
-	<input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>" />
+	<input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e('Select a Color', 'twentyeleven'); ?>" />
 	<div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
 	<br />
-	<span><?php printf( __( 'Default color: %s', 'twentyeleven' ), '<span id="default-color">' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '</span>' ); ?></span>
+	<span><?php printf(__('Default color: %s', 'twentyeleven'), '<span id="default-color">'.twentyeleven_get_default_link_color($options['color_scheme']).'</span>'); ?></span>
 	<?php
 }
 
@@ -309,14 +309,14 @@ 
  */
 function twentyeleven_settings_field_layout() {
 	$options = twentyeleven_get_theme_options();
-	foreach ( twentyeleven_layouts() as $layout ) {
+	foreach (twentyeleven_layouts() as $layout) {
 		?>
 		<div class="layout image-radio-option theme-layout">
 		<label class="description">
-			<input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr( $layout['value'] ); ?>" <?php checked( $options['theme_layout'], $layout['value'] ); ?> />
+			<input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr($layout['value']); ?>" <?php checked($options['theme_layout'], $layout['value']); ?> />
 			<span>
-				<img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" width="136" height="122" alt="" />
-				<?php echo esc_html( $layout['label'] ); ?>
+				<img src="<?php echo esc_url($layout['thumbnail']); ?>" width="136" height="122" alt="" />
+				<?php echo esc_html($layout['label']); ?>
 			</span>
 		</label>
 		</div>
@@ -333,14 +333,14 @@ 
 	?>
 	<div class="wrap">
 		<?php screen_icon(); ?>
-		<?php $theme_name = function_exists( 'wp_get_theme' ) ? wp_get_theme() : get_current_theme(); ?>
-		<h2><?php printf( __( '%s Theme Options', 'twentyeleven' ), $theme_name ); ?></h2>
+		<?php $theme_name = function_exists('wp_get_theme') ? wp_get_theme() : get_current_theme(); ?>
+		<h2><?php printf(__('%s Theme Options', 'twentyeleven'), $theme_name); ?></h2>
 		<?php settings_errors(); ?>
 
 		<form method="post" action="options.php">
 			<?php
-				settings_fields( 'twentyeleven_options' );
-				do_settings_sections( 'theme_options' );
+				settings_fields('twentyeleven_options');
+				do_settings_sections('theme_options');
 				submit_button();
 			?>
 		</form>
@@ -360,22 +360,22 @@ 
  *
  * @param array $input An array of form input.
  */
-function twentyeleven_theme_options_validate( $input ) {
+function twentyeleven_theme_options_validate($input) {
 	$output = $defaults = twentyeleven_get_default_theme_options();
 
 	// Color scheme must be in our array of color scheme options
-	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
+	if (isset($input['color_scheme']) && array_key_exists($input['color_scheme'], twentyeleven_color_schemes()))
 		$output['color_scheme'] = $input['color_scheme'];
 
 	// Our defaults for the link color may have changed, based on the color scheme.
-	$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
+	$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color($output['color_scheme']);
 
 	// Link color must be 3 or 6 hexadecimal characters
-	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
-		$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
+	if (isset($input['link_color']) && preg_match('/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color']))
+		$output['link_color'] = '#'.strtolower(ltrim($input['link_color'], '#'));
 
 	// Theme layout must be in our array of theme layout options
-	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
+	if (isset($input['theme_layout']) && array_key_exists($input['theme_layout'], twentyeleven_layouts()))
 		$output['theme_layout'] = $input['theme_layout'];
 
 	/**
@@ -387,7 +387,7 @@ 
 	 * @param array $input    An array of un-sanitized form input.
 	 * @param array $defaults An array of default theme options.
 	 */
-	return apply_filters( 'twentyeleven_theme_options_validate', $output, $input, $defaults );
+	return apply_filters('twentyeleven_theme_options_validate', $output, $input, $defaults);
 }
 
 /**
@@ -399,8 +399,8 @@ 
 	$options = twentyeleven_get_theme_options();
 	$color_scheme = $options['color_scheme'];
 
-	if ( 'dark' == $color_scheme )
-		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+	if ('dark' == $color_scheme)
+		wp_enqueue_style('dark', get_template_directory_uri().'/colors/dark.css', array(), null);
 
 	/**
 	 * Fires after the styles for the Twenty Eleven color scheme are enqueued.
@@ -409,9 +409,9 @@ 
 	 *
 	 * @param string $color_scheme The color scheme.
 	 */
-	do_action( 'twentyeleven_enqueue_color_scheme', $color_scheme );
+	do_action('twentyeleven_enqueue_color_scheme', $color_scheme);
 }
-add_action( 'wp_enqueue_scripts', 'twentyeleven_enqueue_color_scheme' );
+add_action('wp_enqueue_scripts', 'twentyeleven_enqueue_color_scheme');
 
 /**
  * Add a style block to the theme for the current link color.
@@ -427,7 +427,7 @@ 
 	$default_options = twentyeleven_get_default_theme_options();
 
 	// Don't do anything if the current link color is the default.
-	if ( $default_options['link_color'] == $link_color )
+	if ($default_options['link_color'] == $link_color)
 		return;
 ?>
 	<style>
@@ -459,7 +459,7 @@ 
 	</style>
 <?php
 }
-add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
+add_action('wp_head', 'twentyeleven_print_link_color_style');
 
 /**
  * Add Twenty Eleven layout classes to the array of body classes.
@@ -468,18 +468,18 @@ 
  *
  * @param array $existing_classes An array of existing body classes.
  */
-function twentyeleven_layout_classes( $existing_classes ) {
+function twentyeleven_layout_classes($existing_classes) {
 	$options = twentyeleven_get_theme_options();
 	$current_layout = $options['theme_layout'];
 
-	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
-		$classes = array( 'two-column' );
+	if (in_array($current_layout, array('content-sidebar', 'sidebar-content')))
+		$classes = array('two-column');
 	else
-		$classes = array( 'one-column' );
+		$classes = array('one-column');
 
-	if ( 'content-sidebar' == $current_layout )
+	if ('content-sidebar' == $current_layout)
 		$classes[] = 'right-sidebar';
-	elseif ( 'sidebar-content' == $current_layout )
+	elseif ('sidebar-content' == $current_layout)
 		$classes[] = 'left-sidebar';
 	else
 		$classes[] = $current_layout;
@@ -492,11 +492,11 @@ 
 	 * @param array  $classes        An array of body classes.
 	 * @param string $current_layout The current theme layout.
 	 */
-	$classes = apply_filters( 'twentyeleven_layout_classes', $classes, $current_layout );
+	$classes = apply_filters('twentyeleven_layout_classes', $classes, $current_layout);
 
-	return array_merge( $existing_classes, $classes );
+	return array_merge($existing_classes, $classes);
 }
-add_filter( 'body_class', 'twentyeleven_layout_classes' );
+add_filter('body_class', 'twentyeleven_layout_classes');
 
 /**
  * Implements Twenty Eleven theme options into Customizer
@@ -505,87 +505,87 @@ 
  *
  * @param object $wp_customize Customizer object.
  */
-function twentyeleven_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
-	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
+function twentyeleven_customize_register($wp_customize) {
+	$wp_customize->get_setting('blogname')->transport = 'postMessage';
+	$wp_customize->get_setting('blogdescription')->transport = 'postMessage';
+	$wp_customize->get_setting('header_textcolor')->transport = 'postMessage';
 
-	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
+	if (isset($wp_customize->selective_refresh)) {
+		$wp_customize->selective_refresh->add_partial('blogname', array(
 			'selector' => '#site-title a',
 			'container_inclusive' => false,
 			'render_callback' => 'twentyeleven_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+		));
+		$wp_customize->selective_refresh->add_partial('blogdescription', array(
 			'selector' => '#site-description',
 			'container_inclusive' => false,
 			'render_callback' => 'twentyeleven_customize_partial_blogdescription',
-		) );
+		));
 	}
 
 	$options  = twentyeleven_get_theme_options();
 	$defaults = twentyeleven_get_default_theme_options();
 
-	$wp_customize->add_setting( 'twentyeleven_theme_options[color_scheme]', array(
+	$wp_customize->add_setting('twentyeleven_theme_options[color_scheme]', array(
 		'default'    => $defaults['color_scheme'],
 		'type'       => 'option',
 		'capability' => 'edit_theme_options',
-	) );
+	));
 
 	$schemes = twentyeleven_color_schemes();
 	$choices = array();
-	foreach ( $schemes as $scheme ) {
-		$choices[ $scheme['value'] ] = $scheme['label'];
+	foreach ($schemes as $scheme) {
+		$choices[$scheme['value']] = $scheme['label'];
 	}
 
-	$wp_customize->add_control( 'twentyeleven_color_scheme', array(
-		'label'    => __( 'Color Scheme', 'twentyeleven' ),
+	$wp_customize->add_control('twentyeleven_color_scheme', array(
+		'label'    => __('Color Scheme', 'twentyeleven'),
 		'section'  => 'colors',
 		'settings' => 'twentyeleven_theme_options[color_scheme]',
 		'type'     => 'radio',
 		'choices'  => $choices,
 		'priority' => 5,
-	) );
+	));
 
 	// Link Color (added to Color Scheme section in Customizer)
-	$wp_customize->add_setting( 'twentyeleven_theme_options[link_color]', array(
-		'default'           => twentyeleven_get_default_link_color( $options['color_scheme'] ),
+	$wp_customize->add_setting('twentyeleven_theme_options[link_color]', array(
+		'default'           => twentyeleven_get_default_link_color($options['color_scheme']),
 		'type'              => 'option',
 		'sanitize_callback' => 'sanitize_hex_color',
 		'capability'        => 'edit_theme_options',
-	) );
+	));
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
-		'label'    => __( 'Link Color', 'twentyeleven' ),
+	$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'link_color', array(
+		'label'    => __('Link Color', 'twentyeleven'),
 		'section'  => 'colors',
 		'settings' => 'twentyeleven_theme_options[link_color]',
-	) ) );
+	)));
 
 	// Default Layout
-	$wp_customize->add_section( 'twentyeleven_layout', array(
-		'title'    => __( 'Layout', 'twentyeleven' ),
+	$wp_customize->add_section('twentyeleven_layout', array(
+		'title'    => __('Layout', 'twentyeleven'),
 		'priority' => 50,
-	) );
+	));
 
-	$wp_customize->add_setting( 'twentyeleven_theme_options[theme_layout]', array(
+	$wp_customize->add_setting('twentyeleven_theme_options[theme_layout]', array(
 		'type'              => 'option',
 		'default'           => $defaults['theme_layout'],
 		'sanitize_callback' => 'sanitize_key',
-	) );
+	));
 
 	$layouts = twentyeleven_layouts();
 	$choices = array();
-	foreach ( $layouts as $layout ) {
-		$choices[ $layout['value'] ] = $layout['label'];
+	foreach ($layouts as $layout) {
+		$choices[$layout['value']] = $layout['label'];
 	}
 
-	$wp_customize->add_control( 'twentyeleven_theme_options[theme_layout]', array(
+	$wp_customize->add_control('twentyeleven_theme_options[theme_layout]', array(
 		'section'    => 'twentyeleven_layout',
 		'type'       => 'radio',
 		'choices'    => $choices,
-	) );
+	));
 }
-add_action( 'customize_register', 'twentyeleven_customize_register' );
+add_action('customize_register', 'twentyeleven_customize_register');
 
 /**
  * Render the site title for the selective refresh partial.
@@ -596,7 +596,7 @@ 
  * @return void
  */
 function twentyeleven_customize_partial_blogname() {
-	bloginfo( 'name' );
+	bloginfo('name');
 }
 
 /**
@@ -608,7 +608,7 @@ 
  * @return void
  */
 function twentyeleven_customize_partial_blogdescription() {
-	bloginfo( 'description' );
+	bloginfo('description');
 }
 
 /**
@@ -619,6 +619,6 @@ 
  * @since Twenty Eleven 1.3
  */
 function twentyeleven_customize_preview_js() {
-	wp_enqueue_script( 'twentyeleven-customizer', get_template_directory_uri() . '/inc/theme-customizer.js', array( 'customize-preview' ), '20150401', true );
+	wp_enqueue_script('twentyeleven-customizer', get_template_directory_uri().'/inc/theme-customizer.js', array('customize-preview'), '20150401', true);
 }
-add_action( 'customize_preview_init', 'twentyeleven_customize_preview_js' );
+add_action('customize_preview_init', 'twentyeleven_customize_preview_js');

src/wp-content/themes/twentyeleven/archive.php

Spacing +14 added lines, -14 removed lines

@@ -17,48 +17,48 @@
 		<section id="primary">
 			<div id="content" role="main">
 
-			<?php if ( have_posts() ) : ?>
+			<?php if (have_posts()) : ?>
 
 				<header class="page-header">
 					<h1 class="page-title">
-						<?php if ( is_day() ) : ?>
-							<?php printf( __( 'Daily Archives: %s', 'twentyeleven' ), '<span>' . get_the_date() . '</span>' ); ?>
-						<?php elseif ( is_month() ) : ?>
-							<?php printf( __( 'Monthly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyeleven' ) ) . '</span>' ); ?>
-						<?php elseif ( is_year() ) : ?>
-							<?php printf( __( 'Yearly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentyeleven' ) ) . '</span>' ); ?>
+						<?php if (is_day()) : ?>
+							<?php printf(__('Daily Archives: %s', 'twentyeleven'), '<span>'.get_the_date().'</span>'); ?>
+						<?php elseif (is_month()) : ?>
+							<?php printf(__('Monthly Archives: %s', 'twentyeleven'), '<span>'.get_the_date(_x('F Y', 'monthly archives date format', 'twentyeleven')).'</span>'); ?>
+						<?php elseif (is_year()) : ?>
+							<?php printf(__('Yearly Archives: %s', 'twentyeleven'), '<span>'.get_the_date(_x('Y', 'yearly archives date format', 'twentyeleven')).'</span>'); ?>
 						<?php else : ?>
-							<?php _e( 'Blog Archives', 'twentyeleven' ); ?>
+							<?php _e('Blog Archives', 'twentyeleven'); ?>
 						<?php endif; ?>
 					</h1>
 				</header>
 
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+				<?php twentyeleven_content_nav('nav-above'); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
 					<?php
 						/* Include the Post-Format-specific template for the content.
 						 * If you want to overload this in a child theme then include a file
 						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 					?>
 
 				<?php endwhile; ?>
 
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+				<?php twentyeleven_content_nav('nav-below'); ?>
 
 			<?php else : ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e('Nothing Found', 'twentyeleven'); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php _e('Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven'); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->

Braces +10 added lines, -4 removed lines

@@ -27,8 +27,11 @@ 
 							<?php printf( __( 'Monthly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyeleven' ) ) . '</span>' ); ?>
 						<?php elseif ( is_year() ) : ?>
 							<?php printf( __( 'Yearly Archives: %s', 'twentyeleven' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentyeleven' ) ) . '</span>' ); ?>
-						<?php else : ?>
-							<?php _e( 'Blog Archives', 'twentyeleven' ); ?>
+						<?php else {
+	: ?>
+							<?php _e( 'Blog Archives', 'twentyeleven' );
+}
+?>
 						<?php endif; ?>
 					</h1>
 				</header>
@@ -50,11 +53,14 @@ 
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' );
+}
+?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">

src/wp-content/themes/twentyeleven/content-status.php

Spacing +10 added lines, -10 removed lines

@@ -16,17 +16,17 @@ 
 		<header class="entry-header">
 			<hgroup>
 				<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-				<h3 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h3>
+				<h3 class="entry-format"><?php _e('Status', 'twentyeleven'); ?></h3>
 			</hgroup>
 
-			<?php if ( comments_open() && ! post_password_required() ) : ?>
+			<?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' ) ); ?>
+				<?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 -->
 
-		<?php if ( is_search() ) : // Only display Excerpts for Search ?>
+		<?php if (is_search()) : // Only display Excerpts for Search ?>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
@@ -41,21 +41,21 @@ 
 				 *
 				 * @param int The height and width avatar dimensions in pixels. Default 65.
 				 */
-				echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', 65 ) );
+				echo get_avatar(get_the_author_meta('ID'), apply_filters('twentyeleven_status_avatar', 65));
 				?>
 			</div>
 
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?>
+			<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
 		<footer class="entry-meta">
 			<?php twentyeleven_posted_on(); ?>
-			<?php if ( comments_open() ) : ?>
+			<?php if (comments_open()) : ?>
 			<span class="sep"> | </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>
+			<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; ?>
-			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post-<?php the_ID(); ?> -->

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,8 @@ 
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<div class="entry-content">
 			<div class="avatar">
 				<?php
@@ -42,6 +43,7 @@ 
 				 * @param int The height and width avatar dimensions in pixels. Default 65.
 				 */
 				echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', 65 ) );
+}
 				?>
 			</div>
 

src/wp-content/themes/twentyeleven/author.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 		<section id="primary">
 			<div id="content" role="main">
 
-			<?php if ( have_posts() ) : ?>
+			<?php if (have_posts()) : ?>
 
 				<?php
 					/*
@@ -26,7 +26,7 @@ 
 				?>
 
 				<header class="page-header">
-					<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyeleven' ), '<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="page-title author"><?php printf(__('Author Archives: %s', 'twentyeleven'), '<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>
 
 				<?php
@@ -38,11 +38,11 @@ 
 					rewind_posts();
 				?>
 
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+				<?php twentyeleven_content_nav('nav-above'); ?>
 
 				<?php
 				// If a user has filled out their description, show a bio on their entries.
-				if ( get_the_author_meta( 'description' ) ) : ?>
+				if (get_the_author_meta('description')) : ?>
 				<div id="author-info">
 					<div id="author-avatar">
 						<?php
@@ -53,18 +53,18 @@ 
 						 *
 						 * @param int The height and width avatar dimension in pixels. Default 60.
 						 */
-						echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyeleven_author_bio_avatar_size', 60 ) );
+						echo get_avatar(get_the_author_meta('user_email'), apply_filters('twentyeleven_author_bio_avatar_size', 60));
 						?>
 					</div><!-- #author-avatar -->
 					<div id="author-description">
-						<h2><?php printf( __( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
-						<?php the_author_meta( 'description' ); ?>
+						<h2><?php printf(__('About %s', 'twentyeleven'), get_the_author()); ?></h2>
+						<?php the_author_meta('description'); ?>
 					</div><!-- #author-description	-->
 				</div><!-- #author-info -->
 				<?php endif; ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
 					<?php
 						/*
@@ -72,22 +72,22 @@ 
 						 * If you want to overload this in a child theme then include a file
 						 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
 						 */
-						get_template_part( 'content', get_post_format() );
+						get_template_part('content', get_post_format());
 					?>
 
 				<?php endwhile; ?>
 
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+				<?php twentyeleven_content_nav('nav-below'); ?>
 
 			<?php else : ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e('Nothing Found', 'twentyeleven'); ?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">
-						<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven' ); ?></p>
+						<p><?php _e('Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentyeleven'); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
 				</article><!-- #post-0 -->

Braces +5 added lines, -2 removed lines

@@ -30,11 +30,14 @@
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
-			<?php else : ?>
+			<?php else {
+	: ?>
 
 				<article id="post-0" class="post no-results not-found">
 					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' );
+}
+?></h1>
 					</header><!-- .entry-header -->
 
 					<div class="entry-content">