Changeset 16628 for branches/3.0/wp-content/themes/twentyten/onecolumn-page.php

Timestamp:

11/30/2010 08:29:25 PM (16 years ago)

Author:

nacin

Message:

Merge Twenty Ten 1.1 to the 3.0 branch.

File:

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

branches/3.0/wp-content/themes/twentyten/onecolumn-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(); ?>>
+                                        <h1 class="entry-title"><?php the_title(); ?></h1>
+                                        <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 -->