From 640fe9ad62c2206ef034c893f1350f2fab4ce8d7 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 11 Jun 2011 07:14:59 +0000
Subject: [PATCH] Remove the few post_type == post checks on Post Format
 templates, Post formats only apply to posts. See #17748

git-svn-id: http://svn.automattic.com/wordpress/trunk@18274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/content-aside.php | 3 ---
 wp-content/themes/twentyeleven/content-image.php | 2 --
 wp-content/themes/twentyeleven/content-link.php  | 3 ---
 wp-content/themes/twentyeleven/content-quote.php | 4 ----
 4 files changed, 12 deletions(-)

diff --git a/wp-content/themes/twentyeleven/content-aside.php b/wp-content/themes/twentyeleven/content-aside.php
index 04480faf2..792f6e113 100644
--- a/wp-content/themes/twentyeleven/content-aside.php
+++ b/wp-content/themes/twentyeleven/content-aside.php
@@ -16,9 +16,6 @@
 				<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( 'Aside', 'twentyeleven' ); ?></h2>
 			</hgroup>
-
-			<?php if ( 'post' == get_post_type() ) : ?>
-			<?php endif; ?>
 			
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php
index 4827f611e..2f42f44ff 100644
--- a/wp-content/themes/twentyeleven/content-image.php
+++ b/wp-content/themes/twentyeleven/content-image.php
@@ -29,7 +29,6 @@
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
 			<div class="entry-meta">
 				<?php
 					printf( __( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s" pubdate>%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' ),
@@ -65,7 +64,6 @@
 				<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
 				<?php endif; // End if comments_open() ?>
 			</div><!-- .entry-meta -->
-			<?php endif; ?>
 
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
diff --git a/wp-content/themes/twentyeleven/content-link.php b/wp-content/themes/twentyeleven/content-link.php
index 5ae4096ce..04b5bb26d 100644
--- a/wp-content/themes/twentyeleven/content-link.php
+++ b/wp-content/themes/twentyeleven/content-link.php
@@ -17,9 +17,6 @@
 				<h2 class="entry-format"><?php _e( 'Link', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
-			<?php if ( 'post' == get_post_type() ) : ?>
-			<?php endif; ?>
-
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
diff --git a/wp-content/themes/twentyeleven/content-quote.php b/wp-content/themes/twentyeleven/content-quote.php
index f7be3a72b..342ad812d 100644
--- a/wp-content/themes/twentyeleven/content-quote.php
+++ b/wp-content/themes/twentyeleven/content-quote.php
@@ -15,11 +15,9 @@
 				<h2 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
-			<?php if ( 'post' == get_post_type() ) : ?>
 			<div class="entry-meta">
 				<?php twentyeleven_posted_on(); ?>
 			</div><!-- .entry-meta -->
-			<?php endif; ?>
 
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
@@ -41,7 +39,6 @@
 
 		<footer class="entry-meta">
 			<?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 */
 				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
@@ -64,7 +61,6 @@
 				$show_sep = true; ?>
 			</span>
 			<?php endif; // End if $tags_list ?>
-			<?php endif; // End if 'post' == $post->post_type ?>
 
 			<?php if ( comments_open() ) : ?>
 			<?php if ( $show_sep ) : ?>