From 27ec6b7e00fc0a4ab5ce19b043ee87d649cc520d Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 11 Jun 2011 03:44:42 +0000
Subject: [PATCH] Remove debug comments & more housecleaning. See #17748

git-svn-id: http://svn.automattic.com/wordpress/trunk@18266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/content-gallery.php | 14 +++++++-------
 wp-content/themes/twentyeleven/content-single.php  |  2 +-
 wp-content/themes/twentyeleven/content.php         |  4 ++--
 wp-content/themes/twentyeleven/inc/widgets.php     |  3 +--
 wp-content/themes/twentyeleven/showcase.php        |  3 +--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/wp-content/themes/twentyeleven/content-gallery.php b/wp-content/themes/twentyeleven/content-gallery.php
index 08beae26eb..9bdf077ef3 100644
--- a/wp-content/themes/twentyeleven/content-gallery.php
+++ b/wp-content/themes/twentyeleven/content-gallery.php
@@ -23,13 +23,13 @@
 	</header><!-- .entry-header -->
 
 	<?php if ( is_search() ) : // Only display Excerpts for search pages ?>
-	<div class="entry-summary">
-		<?php the_excerpt(); ?>
-	</div><!-- .entry-summary -->
-	<?php else : ?>
-	<div class="entry-content">
-		<?php if ( post_password_required() ) : ?>
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
+		<div class="entry-summary">
+			<?php the_excerpt(); ?>
+		</div><!-- .entry-summary -->
+		<?php else : ?>
+		<div class="entry-content">
+			<?php if ( post_password_required() ) : ?>
+				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
 
 			<?php else : ?>
 				<?php
diff --git a/wp-content/themes/twentyeleven/content-single.php b/wp-content/themes/twentyeleven/content-single.php
index 1cf9cb89d2..7181025209 100644
--- a/wp-content/themes/twentyeleven/content-single.php
+++ b/wp-content/themes/twentyeleven/content-single.php
@@ -12,7 +12,7 @@
 	<header class="entry-header">
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 
-		<?php if ( 'post' == get_post_type() ) : /* Bit of a disconnect here, Some files include this test, not all do. */ ?>
+		<?php if ( 'post' == get_post_type() ) : ?>
 		<div class="entry-meta">
 			<?php twentyeleven_posted_on(); ?>
 		</div><!-- .entry-meta -->
diff --git a/wp-content/themes/twentyeleven/content.php b/wp-content/themes/twentyeleven/content.php
index bc593e4cd5..a014becdb7 100644
--- a/wp-content/themes/twentyeleven/content.php
+++ b/wp-content/themes/twentyeleven/content.php
@@ -12,7 +12,7 @@
 		<header class="entry-header">
 			<?php if ( is_sticky() ) : ?>
 				<hgroup>
-					<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) /* Y NO ARRAY! */ ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+					<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
 					<h2 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h2>
 				</hgroup>
 			<?php else : ?>
@@ -44,7 +44,7 @@
 		<?php endif; ?>
 
 		<footer class="entry-meta">
-			<?php $show_sep = false; //  perhaps a implode(' | ', $utilities) could be used instead of this $show_sep business? ?>
+			<?php $show_sep = false; ?>
 			<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
 			<?php
 				/* translators: used between list items, there is a space after the comma */
diff --git a/wp-content/themes/twentyeleven/inc/widgets.php b/wp-content/themes/twentyeleven/inc/widgets.php
index 8d8ce43756..3ea38e57ba 100644
--- a/wp-content/themes/twentyeleven/inc/widgets.php
+++ b/wp-content/themes/twentyeleven/inc/widgets.php
@@ -72,8 +72,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 				),
 			),
 		);
-		$ephemera = new WP_Query();
-		$ephemera->query( $ephemera_args );
+		$ephemera = new WP_Query( $ephemera_args );
 
 		if ( $ephemera->have_posts() ) :
 
diff --git a/wp-content/themes/twentyeleven/showcase.php b/wp-content/themes/twentyeleven/showcase.php
index eae1037df3..19c5b99971 100644
--- a/wp-content/themes/twentyeleven/showcase.php
+++ b/wp-content/themes/twentyeleven/showcase.php
@@ -178,8 +178,7 @@ get_header(); ?>
 						'no_found_rows' => true,
 					);
 					// Our new query for the Recent Posts section.
-					$recent = new WP_Query();
-					$recent->query( $recent_args );
+					$recent = new WP_Query( $recent_args );
 					$counter = 0;
 
 					while ( $recent->have_posts() ) : $recent->the_post();