Changes from trunk/wp-content/themes/twentyten/page.php at r17340 to branches/3.0/wp-content/themes/twentyten/page.php at r16630

File:

• branches/3.0/wp-content/themes/twentyten/page.php (modified) (1 diff)

branches/3.0/wp-content/themes/twentyten/page.php

@@ -18 +18 @@
             <div id="content" role="main">
 
-            <?php
-            /* Run the loop to output the page.
-             * If you want to overload this in a child theme then include a file
-             * called loop-page.php and that will be used instead.
-             */
-            get_template_part( 'loop', 'page' );
-            ?>
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+                <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                    <?php if ( is_front_page() ) { ?>
+                        <h2 class="entry-title"><?php the_title(); ?></h2>
+                    <?php } else { ?>
+                        <h1 class="entry-title"><?php the_title(); ?></h1>
+                    <?php } ?>
+
+                    <div class="entry-content">
+                        <?php the_content(); ?>
+                        <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+                    </div><!-- .entry-content -->
+                </div><!-- #post-## -->
+
+                <?php comments_template( '', true ); ?>
+
+<?php endwhile; ?>
 
             </div><!-- #content -->