Changeset 25021 for trunk/src/wp-content/themes/twentyfourteen/content-post-format.php

Timestamp:

08/14/2013 04:38:01 PM (13 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: first pass at matching code standards achieved with Twenty Thirteen development. See #24858, props obenland.

File:

• trunk/src/wp-content/themes/twentyfourteen/content-post-format.php (modified) (3 diffs)

trunk/src/wp-content/themes/twentyfourteen/content-post-format.php

@@ -44 +44 @@
                                 if ( 'post' == get_post_type() )
                                         twentyfourteen_posted_on();
+
+                                if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) :
                         ?>
-
-                        <?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-                                <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
                         <?php endif; ?>
 
@@ -54 +54 @@
         </header><!-- .entry-header -->
 
-        <div class="entry-content clearfix">
-                <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) ); ?>
+        <div class="entry-content">
                 <?php
+                        the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
                         wp_link_pages( array(
                                 'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
                                 'after'       => '</div>',
                                 'link_before' => '<span>',
-                                'link_after'  => '</span>'
+                                'link_after'  => '</span>',
                         ) );
                 ?>
@@ -67 +67 @@
 
         <footer class="entry-meta">
-                <?php if ( ( 'quote' == $format ) || ( 'aside' == $format ) ) : ?>
+                <?php if ( has_post_format( array( 'quote', 'aside' ) ) ) : ?>
                 <div class="entry-meta">
-                        <?php the_title( '<h1 class="entry-title"><a href="' . get_permalink() . '" rel="bookmark">', '</a></h1>' ); ?>
+                        <?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
                 </div>
                 <?php endif; ?>
 
-                <?php
-                        $tag_list = get_the_tag_list();
-                        if ( '' != $tag_list && 'post' == get_post_type() ) :
-                ?>
-                <span class="tag-links"><?php echo $tag_list; ?></span>
-                <?php endif; // End if $tag_list ?>
+                <?php if ( has_tag() ) : ?>
+                <span class="tag-links"><?php echo get_the_tag_list(); ?></span>
+                <?php endif; ?>
         </footer><!-- .entry-meta -->
-
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-## -->