<!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>[15391] branches/3.0/wp-content/themes/twentyten: Update to Twenty Ten 1.0.
3 from theme dir.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15391">15391</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-07-12 19:39:59 +0000 (Mon, 12 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to Twenty Ten 1.0.3 from theme dir. see <a href="http://trac.wordpress.org/ticket/14284">#14284</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpcontentthemestwentytenattachmentphp">branches/3.0/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#branches30wpcontentthemestwentyteneditorstylecss">branches/3.0/wp-content/themes/twentyten/editor-style.css</a></li>
<li><a href="#branches30wpcontentthemestwentytenfunctionsphp">branches/3.0/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenheaderphp">branches/3.0/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenloopphp">branches/3.0/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#branches30wpcontentthemestwentytenstylecss">branches/3.0/wp-content/themes/twentyten/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/attachment.php (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/attachment.php 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/attachment.php 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -14,10 +14,12 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>- <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
- /* translators: %s - title of parent post */
- printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
- ?></a></p>
</del><ins>+ <?php if ( ! empty( $post->post_parent ) ) : ?>
+ <p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+ /* translators: %s - title of parent post */
+ printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
+ ?></a></p>
+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h2 class="entry-title"><?php the_title(); ?></h2>
</span></span></pre></div>
<a id="branches30wpcontentthemestwentyteneditorstylecss"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/editor-style.css (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/editor-style.css 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/editor-style.css 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> line-height: 18px;
</span><span class="cx"> }
</span><span class="cx"> hr {
</span><del>- background-color: #E7E7E7;
</del><ins>+ background-color: #e7e7e7;
</ins><span class="cx"> border:0;
</span><span class="cx"> height: 1px;
</span><span class="cx"> margin-bottom: 18px;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> font-size: 131.25%;
</span><span class="cx"> }
</span><span class="cx"> ins {
</span><del>- background: #FFFFCC;
</del><ins>+ background: #ffffcc;
</ins><span class="cx"> border: none;
</span><span class="cx"> color: #333;
</span><span class="cx"> }
</span><span class="lines">@@ -142,14 +142,14 @@
</span><span class="cx"> top: .5ex;
</span><span class="cx"> }
</span><span class="cx"> a:link {
</span><del>- color:#0066CC;
</del><ins>+ color:#0066cc;
</ins><span class="cx"> }
</span><span class="cx"> a:visited {
</span><span class="cx"> color:#743399;
</span><span class="cx"> }
</span><span class="cx"> a:active,
</span><span class="cx"> a:hover {
</span><del>- color: #FF4B33;
</del><ins>+ color: #ff4b33;
</ins><span class="cx"> }
</span><span class="cx"> p,
</span><span class="cx"> ul,
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/functions.php (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/functions.php 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/functions.php 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -204,64 +204,6 @@
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Makes some changes to the <title> tag, by filtering the output of wp_title().
- *
- * If we have a site description and we're viewing the home page or a blog posts
- * page (when using a static front page), then we will add the site description.
- *
- * If we're viewing a search result, then we're going to recreate the title entirely.
- * We're going to add page numbers to all titles as well, to the middle of a search
- * result title and the end of all other titles.
- *
- * The site title also gets added to all titles.
- *
- * @since Twenty Ten 1.0
- *
- * @param string $title Title generated by wp_title()
- * @param string $separator The separator passed to wp_title(). Twenty Ten uses a
- * vertical bar, "|", as a separator in header.php.
- * @return string The new title, ready for the <title> tag.
- */
-function twentyten_filter_wp_title( $title, $separator ) {
- // Don't affect wp_title() calls in feeds.
- if ( is_feed() )
- return $title;
-
- // The $paged global variable contains the page number of a listing of posts.
- // The $page global variable contains the page number of a single post that is paged.
- // We'll display whichever one applies, if we're not looking at the first page.
- global $paged, $page;
-
- if ( is_search() ) {
- // If we're a search, let's start over:
- $title = sprintf( __( 'Search results for %s', 'twentyten' ), '"' . get_search_query() . '"' );
- // Add a page number if we're on page 2 or more:
- if ( $paged >= 2 )
- $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), $paged );
- // Add the site name to the end:
- $title .= " $separator " . get_bloginfo( 'name', 'display' );
- // We're done. Let's send the new title back to wp_title():
- return $title;
- }
-
- // Otherwise, let's start by adding the site name to the end:
- $title .= get_bloginfo( 'name', 'display' );
-
- // If we have a site description and we're on the home/front page, add the description:
- $site_description = get_bloginfo( 'description', 'display' );
- if ( $site_description && ( is_home() || is_front_page() ) )
- $title .= " $separator " . $site_description;
-
- // Add a page number if necessary:
- if ( $paged >= 2 || $page >= 2 )
- $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
-
- // Return the new title to wp_title():
- return $title;
-}
-add_filter( 'wp_title', 'twentyten_filter_wp_title', 10, 2 );
-
-/**
</del><span class="cx"> * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</span><span class="cx"> *
</span><span class="cx"> * To override this in a child theme, remove the filter and optionally add
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/header.php (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/header.php 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/header.php 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -15,11 +15,23 @@
</span><span class="cx"> <title><?php
</span><span class="cx"> /*
</span><span class="cx"> * Print the <title> tag based on what is being viewed.
</span><del>- * We filter the output of wp_title() a bit -- see
- * twentyten_filter_wp_title() in functions.php.
</del><span class="cx"> */
</span><ins>+ global $page, $paged;
+
</ins><span class="cx"> wp_title( '|', true, 'right' );
</span><span class="cx">
</span><ins>+ // Add the blog name.
+ bloginfo( 'name' );
+
+ // Add the blog description for the home/front page.
+ $site_description = get_bloginfo( 'description', 'display' );
+ if ( $site_description && ( is_home() || is_front_page() ) )
+ echo " | $site_description";
+
+ // Add a page number if necessary:
+ if ( $paged >= 2 || $page >= 2 )
+ echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
+
</ins><span class="cx"> ?></title>
</span><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/loop.php (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/loop.php 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/loop.php 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -68,22 +68,23 @@
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php if ( post_password_required() ) : ?>
</span><span class="cx"> <?php the_content(); ?>
</span><del>-<?php else : ?>
- <div class="gallery-thumb">
-<?php
- $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
- $total_images = count( $images );
- $image = array_shift( $images );
- $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
-?>
- <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
- </div><!-- .gallery-thumb -->
- <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
- 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
- $total_images
- ); ?></em></p>
-
- <?php the_excerpt(); ?>
</del><ins>+<?php else : ?>
+ <?php
+ $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
+ if ( $images ) :
+ $total_images = count( $images );
+ $image = array_shift( $images );
+ $image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
+ ?>
+ <div class="gallery-thumb">
+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
+ </div><!-- .gallery-thumb -->
+ <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
+ 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
+ $total_images
+ ); ?></em></p>
+ <?php endif; ?>
+ <?php the_excerpt(); ?>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span></span></pre></div>
<a id="branches30wpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-content/themes/twentyten/style.css (15390 => 15391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-content/themes/twentyten/style.css 2010-07-12 15:28:54 UTC (rev 15390)
+++ branches/3.0/wp-content/themes/twentyten/style.css 2010-07-12 19:39:59 UTC (rev 15391)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style
</span><span class="cx"> */
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* Reset default browser CSS. Based on work by Eric Meyer: http://meyerweb.com/eric/tools/css/reset/index.html
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>