<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16630] branches/3.0/wp-content/themes/twentyten: Complete Twenty Ten 1.
 1 merge.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16630">16630</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-30 20:38:12 +0000 (Tue, 30 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Complete Twenty Ten 1.1 merge.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenlanguagestwentytenpot">branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenloopattachmentphp">branches/3.0/wp-content/themes/twentyten/loop-attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenlooppagephp">branches/3.0/wp-content/themes/twentyten/loop-page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenloopsinglephp">branches/3.0/wp-content/themes/twentyten/loop-single.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenpagephp">branches/3.0/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#branches30wpcontentthemestwentytensinglephp">branches/3.0/wp-content/themes/twentyten/single.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/attachment.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx">   + native
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenlanguagestwentytenpot"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/languages/twentyten.pot        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Translation of the WordPress theme Twenty Ten 1.2-RC1 by the WordPress team.
</del><ins>+# Translation of the WordPress theme Twenty Ten 1.1 by the WordPress team.
</ins><span class="cx"> # Copyright (C) 2010 the WordPress team
</span><span class="cx"> # This file is distributed under the same license as the Twenty Ten package.
</span><span class="cx"> # FIRST AUTHOR &lt;EMAIL@ADDRESS&gt;, 2010.
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx"> #, fuzzy
</span><span class="cx"> msgid &quot;&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><del>-&quot;Project-Id-Version: Twenty Ten 1.2-RC1\n&quot;
</del><ins>+&quot;Project-Id-Version: Twenty Ten 1.1\n&quot;
</ins><span class="cx"> &quot;Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n&quot;
</span><del>-&quot;POT-Creation-Date: 2010-11-06 00:21+0000\n&quot;
</del><ins>+&quot;POT-Creation-Date: 2010-07-14 16:21+0000\n&quot;
</ins><span class="cx"> &quot;PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n&quot;
</span><span class="cx"> &quot;Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n&quot;
</span><span class="cx"> &quot;Language-Team: LANGUAGE &lt;LL@li.org&gt;\n&quot;
</span><span class="lines">@@ -46,12 +46,61 @@
</span><span class="cx"> msgid &quot;Blog Archives&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><ins>+#: attachment.php:18
+#, php-format
+msgid &quot;Return to %s&quot;
+msgstr &quot;&quot;
+
+#. translators: %s - title of parent post
+#: attachment.php:20
+#, php-format
+msgid &quot;&lt;span class=\&quot;meta-nav\&quot;&gt;&amp;larr;&lt;/span&gt; %s&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:29
+#, php-format
+msgid &quot;&lt;span class=\&quot;%1$s\&quot;&gt;By&lt;/span&gt; %2$s&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:33 functions.php:451
+#, php-format
+msgid &quot;View all posts by %s&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:40
+#, php-format
+msgid &quot;&lt;span class=\&quot;%1$s\&quot;&gt;Published&lt;/span&gt; %2$s&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:50
+#, php-format
+msgid &quot;Full size is %s pixels&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:53
+msgid &quot;Link to full-size image&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:60 attachment.php:107 loop.php:95 loop.php:118 loop.php:160
+#: onecolumn-page.php:27 page.php:32 single.php:53
+msgid &quot;Edit&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:100 functions.php:241 loop.php:110 loop.php:138
+msgid &quot;Continue reading &lt;span class=\&quot;meta-nav\&quot;&gt;&amp;rarr;&lt;/span&gt;&quot;
+msgstr &quot;&quot;
+
+#: attachment.php:101 loop.php:139 onecolumn-page.php:26 page.php:31
+#: single.php:31
+msgid &quot;Pages:&quot;
+msgstr &quot;&quot;
+
</ins><span class="cx"> #: author.php:27
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid &quot;Author Archives: %s&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><del>-#: author.php:37 loop-single.php:43
</del><ins>+#: author.php:37 single.php:40
</ins><span class="cx"> #, php-format
</span><span class="cx"> msgid &quot;About %s&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="lines">@@ -85,7 +134,7 @@
</span><span class="cx"> msgid &quot;Comments are closed.&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><del>-#. #-#-#-#-#  twentyten.pot (Twenty Ten 1.2-RC1)  #-#-#-#-#
</del><ins>+#. #-#-#-#-#  twentyten.pot (Twenty Ten 1.1)  #-#-#-#-#
</ins><span class="cx"> #. Theme URI of the plugin/theme
</span><span class="cx"> #: footer.php:33
</span><span class="cx"> msgid &quot;http://wordpress.org/&quot;
</span><span class="lines">@@ -144,10 +193,6 @@
</span><span class="cx"> msgid &quot;Sunset&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><del>-#: functions.php:241 loop-attachment.php:103 loop.php:110 loop.php:138
-msgid &quot;Continue reading &lt;span class=\&quot;meta-nav\&quot;&gt;&amp;rarr;&lt;/span&gt;&quot;
-msgstr &quot;&quot;
-
</del><span class="cx"> #: functions.php:308
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid &quot;%s &lt;span class=\&quot;says\&quot;&gt;says:&lt;/span&gt;&quot;
</span><span class="lines">@@ -226,11 +271,6 @@
</span><span class="cx"> &quot;span&gt; %3$s&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><del>-#: functions.php:451 loop-attachment.php:36
-#, php-format
-msgid &quot;View all posts by %s&quot;
-msgstr &quot;&quot;
-
</del><span class="cx"> #: functions.php:468
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid &quot;&quot;
</span><span class="lines">@@ -261,60 +301,6 @@
</span><span class="cx"> msgid &quot;Skip to content&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><del>-#: loop-attachment.php:21
-#, php-format
-msgid &quot;Return to %s&quot;
-msgstr &quot;&quot;
-
-#. translators: %s - title of parent post
-#: loop-attachment.php:23
-#, php-format
-msgid &quot;&lt;span class=\&quot;meta-nav\&quot;&gt;&amp;larr;&lt;/span&gt; %s&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:32
-#, php-format
-msgid &quot;&lt;span class=\&quot;%1$s\&quot;&gt;By&lt;/span&gt; %2$s&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:43
-#, php-format
-msgid &quot;&lt;span class=\&quot;%1$s\&quot;&gt;Published&lt;/span&gt; %2$s&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:53
-#, php-format
-msgid &quot;Full size is %s pixels&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:56
-msgid &quot;Link to full-size image&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:63 loop-attachment.php:110 loop-page.php:30
-#: loop-single.php:56 loop.php:95 loop.php:118 loop.php:160
-msgid &quot;Edit&quot;
-msgstr &quot;&quot;
-
-#: loop-attachment.php:104 loop-page.php:29 loop-single.php:34 loop.php:139
-msgid &quot;Pages:&quot;
-msgstr &quot;&quot;
-
-#: loop-single.php:21 loop-single.php:61
-msgctxt &quot;Previous post link&quot;
-msgid &quot;&amp;larr;&quot;
-msgstr &quot;&quot;
-
-#: loop-single.php:22 loop-single.php:62
-msgctxt &quot;Next post link&quot;
-msgid &quot;&amp;rarr;&quot;
-msgstr &quot;&quot;
-
-#: loop-single.php:47
-#, php-format
-msgid &quot;View all posts by %s &lt;span class=\&quot;meta-nav\&quot;&gt;&amp;rarr;&lt;/span&gt;&quot;
-msgstr &quot;&quot;
-
</del><span class="cx"> #: loop.php:25 loop.php:173
</span><span class="cx"> msgid &quot;&lt;span class=\&quot;meta-nav\&quot;&gt;&amp;larr;&lt;/span&gt; Older posts&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="lines">@@ -402,6 +388,21 @@
</span><span class="cx"> msgid &quot;Meta&quot;
</span><span class="cx"> msgstr &quot;&quot;
</span><span class="cx"> 
</span><ins>+#: single.php:18 single.php:58
+msgctxt &quot;Previous post link&quot;
+msgid &quot;&amp;larr;&quot;
+msgstr &quot;&quot;
+
+#: single.php:19 single.php:59
+msgctxt &quot;Next post link&quot;
+msgid &quot;&amp;rarr;&quot;
+msgstr &quot;&quot;
+
+#: single.php:44
+#, php-format
+msgid &quot;View all posts by %s &lt;span class=\&quot;meta-nav\&quot;&gt;&amp;rarr;&lt;/span&gt;&quot;
+msgstr &quot;&quot;
+
</ins><span class="cx"> #: tag.php:16
</span><span class="cx"> #, php-format
</span><span class="cx"> msgid &quot;Tag Archives: %s&quot;
</span><span class="lines">@@ -431,5 +432,5 @@
</span><span class="cx"> msgid &quot;&quot;
</span><span class="cx"> &quot;black, blue, white, two-columns, fixed-width, custom-header, custom-&quot;
</span><span class="cx"> &quot;background, threaded-comments, sticky-post, translation-ready, microformats, &quot;
</span><del>-&quot;rtl-language-support, editor-style, custom-menu&quot;
</del><ins>+&quot;rtl-language-support, editor-style&quot;
</ins><span class="cx"> msgstr &quot;&quot;
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopattachmentphp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-attachment.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-attachment.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-attachment.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,116 +0,0 @@
</span><del>-&lt;?php
-/**
- * The loop that displays an attachment.
- *
- * The loop displays the posts and the post content.  See
- * http://codex.wordpress.org/The_Loop to understand it and
- * http://codex.wordpress.org/Template_Tags to understand
- * the tags used in it.
- *
- * This can be overridden in child themes with loop-attachment.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?&gt;
-
-&lt;?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?&gt;
-
-                                &lt;?php if ( ! empty( $post-&gt;post_parent ) ) : ?&gt;
-                                        &lt;p class=&quot;page-title&quot;&gt;&lt;a href=&quot;&lt;?php echo get_permalink( $post-&gt;post_parent ); ?&gt;&quot; title=&quot;&lt;?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post-&gt;post_parent ) ) ); ?&gt;&quot; rel=&quot;gallery&quot;&gt;&lt;?php
-                                                /* translators: %s - title of parent post */
-                                                printf( __( '&lt;span class=&quot;meta-nav&quot;&gt;&amp;larr;&lt;/span&gt; %s', 'twentyten' ), get_the_title( $post-&gt;post_parent ) );
-                                        ?&gt;&lt;/a&gt;&lt;/p&gt;
-                                &lt;?php endif; ?&gt;
-
-                                &lt;div id=&quot;post-&lt;?php the_ID(); ?&gt;&quot; &lt;?php post_class(); ?&gt;&gt;
-                                        &lt;h2 class=&quot;entry-title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h2&gt;
-
-                                        &lt;div class=&quot;entry-meta&quot;&gt;
-                                                &lt;?php
-                                                        printf(__('&lt;span class=&quot;%1$s&quot;&gt;By&lt;/span&gt; %2$s', 'twentyten'),
-                                                                'meta-prep meta-prep-author',
-                                                                sprintf( '&lt;span class=&quot;author vcard&quot;&gt;&lt;a class=&quot;url fn n&quot; href=&quot;%1$s&quot; title=&quot;%2$s&quot;&gt;%3$s&lt;/a&gt;&lt;/span&gt;',
-                                                                        get_author_posts_url( get_the_author_meta( 'ID' ) ),
-                                                                        sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
-                                                                        get_the_author()
-                                                                )
-                                                        );
-                                                ?&gt;
-                                                &lt;span class=&quot;meta-sep&quot;&gt;|&lt;/span&gt;
-                                                &lt;?php
-                                                        printf( __('&lt;span class=&quot;%1$s&quot;&gt;Published&lt;/span&gt; %2$s', 'twentyten'),
-                                                                'meta-prep meta-prep-entry-date',
-                                                                sprintf( '&lt;span class=&quot;entry-date&quot;&gt;&lt;abbr class=&quot;published&quot; title=&quot;%1$s&quot;&gt;%2$s&lt;/abbr&gt;&lt;/span&gt;',
-                                                                        esc_attr( get_the_time() ),
-                                                                        get_the_date()
-                                                                )
-                                                        );
-                                                        if ( wp_attachment_is_image() ) {
-                                                                echo ' &lt;span class=&quot;meta-sep&quot;&gt;|&lt;/span&gt; ';
-                                                                $metadata = wp_get_attachment_metadata();
-                                                                printf( __( 'Full size is %s pixels', 'twentyten'),
-                                                                        sprintf( '&lt;a href=&quot;%1$s&quot; title=&quot;%2$s&quot;&gt;%3$s &amp;times; %4$s&lt;/a&gt;',
-                                                                                wp_get_attachment_url(),
-                                                                                esc_attr( __('Link to full-size image', 'twentyten') ),
-                                                                                $metadata['width'],
-                                                                                $metadata['height']
-                                                                        )
-                                                                );
-                                                        }
-                                                ?&gt;
-                                                &lt;?php edit_post_link( __( 'Edit', 'twentyten' ), '&lt;span class=&quot;meta-sep&quot;&gt;|&lt;/span&gt; &lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-meta --&gt;
-
-                                        &lt;div class=&quot;entry-content&quot;&gt;
-                                                &lt;div class=&quot;entry-attachment&quot;&gt;
-&lt;?php if ( wp_attachment_is_image() ) :
-        $attachments = array_values( get_children( array( 'post_parent' =&gt; $post-&gt;post_parent, 'post_status' =&gt; 'inherit', 'post_type' =&gt; 'attachment', 'post_mime_type' =&gt; 'image', 'order' =&gt; 'ASC', 'orderby' =&gt; 'menu_order ID' ) ) );
-        foreach ( $attachments as $k =&gt; $attachment ) {
-                if ( $attachment-&gt;ID == $post-&gt;ID )
-                        break;
-        }
-        $k++;
-        // If there is more than 1 image attachment in a gallery
-        if ( count( $attachments ) &gt; 1 ) {
-                if ( isset( $attachments[ $k ] ) )
-                        // get the URL of the next image attachment
-                        $next_attachment_url = get_attachment_link( $attachments[ $k ]-&gt;ID );
-                else
-                        // or get the URL of the first image attachment
-                        $next_attachment_url = get_attachment_link( $attachments[ 0 ]-&gt;ID );
-        } else {
-                // or, if there's only 1 image attachment, get the URL of the image
-                $next_attachment_url = wp_get_attachment_url();
-        }
-?&gt;
-                                                &lt;p class=&quot;attachment&quot;&gt;&lt;a href=&quot;&lt;?php echo $next_attachment_url; ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php
-                                                        $attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
-                                                        echo wp_get_attachment_image( $post-&gt;ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
-                                                ?&gt;&lt;/a&gt;&lt;/p&gt;
-
-                                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
-                                                        &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_image_link( false ); ?&gt;&lt;/div&gt;
-                                                        &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_image_link( false ); ?&gt;&lt;/div&gt;
-                                                &lt;/div&gt;&lt;!-- #nav-below --&gt;
-&lt;?php else : ?&gt;
-                                                &lt;a href=&quot;&lt;?php echo wp_get_attachment_url(); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php echo basename( get_permalink() ); ?&gt;&lt;/a&gt;
-&lt;?php endif; ?&gt;
-                                                &lt;/div&gt;&lt;!-- .entry-attachment --&gt;
-                                                &lt;div class=&quot;entry-caption&quot;&gt;&lt;?php if ( !empty( $post-&gt;post_excerpt ) ) the_excerpt(); ?&gt;&lt;/div&gt;
-
-&lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyten' ) ); ?&gt;
-&lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyten' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
-
-                                        &lt;/div&gt;&lt;!-- .entry-content --&gt;
-
-                                        &lt;div class=&quot;entry-utility&quot;&gt;
-                                                &lt;?php twentyten_posted_in(); ?&gt;
-                                                &lt;?php edit_post_link( __( 'Edit', 'twentyten' ), ' &lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-utility --&gt;
-                                &lt;/div&gt;&lt;!-- #post-## --&gt;
-
-&lt;?php comments_template(); ?&gt;
-
-&lt;?php endwhile; // end of the loop. ?&gt;
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenlooppagephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-page.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-page.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-page.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-&lt;?php
-/**
- * The loop that displays a page.
- *
- * The loop displays the posts and the post content.  See
- * http://codex.wordpress.org/The_Loop to understand it and
- * http://codex.wordpress.org/Template_Tags to understand
- * the tags used in it.
- *
- * This can be overridden in child themes with loop-page.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?&gt;
-
-&lt;?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?&gt;
-
-                                &lt;div id=&quot;post-&lt;?php the_ID(); ?&gt;&quot; &lt;?php post_class(); ?&gt;&gt;
-                                        &lt;?php if ( is_front_page() ) { ?&gt;
-                                                &lt;h2 class=&quot;entry-title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h2&gt;
-                                        &lt;?php } else { ?&gt;
-                                                &lt;h1 class=&quot;entry-title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
-                                        &lt;?php } ?&gt;
-
-                                        &lt;div class=&quot;entry-content&quot;&gt;
-                                                &lt;?php the_content(); ?&gt;
-                                                &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyten' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
-                                                &lt;?php edit_post_link( __( 'Edit', 'twentyten' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-content --&gt;
-                                &lt;/div&gt;&lt;!-- #post-## --&gt;
-
-                                &lt;?php comments_template( '', true ); ?&gt;
-
-&lt;?php endwhile; // end of the loop. ?&gt;
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopsinglephp"></a>
<div class="delfile"><h4>Deleted: branches/3.0/wp-content/themes/twentyten/loop-single.php (16629 => 16630)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop-single.php        2010-11-30 20:31:49 UTC (rev 16629)
+++ branches/3.0/wp-content/themes/twentyten/loop-single.php        2010-11-30 20:38:12 UTC (rev 16630)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-&lt;?php
-/**
- * The loop that displays a single post.
- *
- * The loop displays the posts and the post content.  See
- * http://codex.wordpress.org/The_Loop to understand it and
- * http://codex.wordpress.org/Template_Tags to understand
- * the tags used in it.
- *
- * This can be overridden in child themes with loop-single.php.
- *
- * @package WordPress
- * @subpackage Twenty_Ten
- * @since Twenty Ten 1.2
- */
-?&gt;
-
-&lt;?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?&gt;
-
-                                &lt;div id=&quot;nav-above&quot; class=&quot;navigation&quot;&gt;
-                                        &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_post_link( '%link', '&lt;span class=&quot;meta-nav&quot;&gt;' . _x( '&amp;larr;', 'Previous post link', 'twentyten' ) . '&lt;/span&gt; %title' ); ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_post_link( '%link', '%title &lt;span class=&quot;meta-nav&quot;&gt;' . _x( '&amp;rarr;', 'Next post link', 'twentyten' ) . '&lt;/span&gt;' ); ?&gt;&lt;/div&gt;
-                                &lt;/div&gt;&lt;!-- #nav-above --&gt;
-
-                                &lt;div id=&quot;post-&lt;?php the_ID(); ?&gt;&quot; &lt;?php post_class(); ?&gt;&gt;
-                                        &lt;h1 class=&quot;entry-title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
-
-                                        &lt;div class=&quot;entry-meta&quot;&gt;
-                                                &lt;?php twentyten_posted_on(); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-meta --&gt;
-
-                                        &lt;div class=&quot;entry-content&quot;&gt;
-                                                &lt;?php the_content(); ?&gt;
-                                                &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyten' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-content --&gt;
-
-&lt;?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries  ?&gt;
-                                        &lt;div id=&quot;entry-author-info&quot;&gt;
-                                                &lt;div id=&quot;author-avatar&quot;&gt;
-                                                        &lt;?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?&gt;
-                                                &lt;/div&gt;&lt;!-- #author-avatar --&gt;
-                                                &lt;div id=&quot;author-description&quot;&gt;
-                                                        &lt;h2&gt;&lt;?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?&gt;&lt;/h2&gt;
-                                                        &lt;?php the_author_meta( 'description' ); ?&gt;
-                                                        &lt;div id=&quot;author-link&quot;&gt;
-                                                                &lt;a href=&quot;&lt;?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?&gt;&quot;&gt;
-                                                                        &lt;?php printf( __( 'View all posts by %s &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyten' ), get_the_author() ); ?&gt;
-                                                                &lt;/a&gt;
-                                                        &lt;/div&gt;&lt;!-- #author-link        --&gt;
-                                                &lt;/div&gt;&lt;!-- #author-description --&gt;
-                                        &lt;/div&gt;&lt;!-- #entry-author-info --&gt;
-&lt;?php endif; ?&gt;
-
-                                        &lt;div class=&quot;entry-utility&quot;&gt;
-                                                &lt;?php twentyten_posted_in(); ?&gt;
-                                                &lt;?php edit_post_link( __( 'Edit', 'twentyten' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
-                                        &lt;/div&gt;&lt;!-- .entry-utility --&gt;
-                                &lt;/div&gt;&lt;!-- #post-## --&gt;
-
-                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
-                                        &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_post_link( '%link', '&lt;span class=&quot;meta-nav&quot;&gt;' . _x( '&amp;larr;', 'Previous post link', 'twentyten' ) . '&lt;/span&gt; %title' ); ?&gt;&lt;/div&gt;
-                                        &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_post_link( '%link', '%title &lt;span class=&quot;meta-nav&quot;&gt;' . _x( '&amp;rarr;', 'Next post link', 'twentyten' ) . '&lt;/span&gt;' ); ?&gt;&lt;/div&gt;
-                                &lt;/div&gt;&lt;!-- #nav-below --&gt;
-
-                                &lt;?php comments_template( '', true ); ?&gt;
-
-&lt;?php endwhile; // end of the loop. ?&gt;
</del></span></pre></div>
<a id="branches30wpcontentthemestwentytenpagephp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/page.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx">   + native
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytensinglephp"></a>
<div class="propset"><h4>Property changes: branches/3.0/wp-content/themes/twentyten/single.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx">   + native
</span></span></pre>
</div>
</div>

</body>
</html>