<!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>[13025] trunk: Trim trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13025">13025</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 18:02:23 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trim trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminjspostdevjs">trunk/wp-admin/js/post.dev.js</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpcontentthemestwentyten404php">trunk/wp-content/themes/twentyten/404.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenauthorphp">trunk/wp-content/themes/twentyten/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentyteneditorstylecss">trunk/wp-content/themes/twentyten/editor-style.css</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenpagephp">trunk/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenprintcss">trunk/wp-content/themes/twentyten/print.css</a></li>
<li><a href="#trunkwpcontentthemestwentytenrtlcss">trunk/wp-content/themes/twentyten/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarfooterphp">trunk/wp-content/themes/twentyten/sidebar-footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarphp">trunk/wp-content/themes/twentyten/sidebar.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenstylecss">trunk/wp-content/themes/twentyten/style.css</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/edit-tag-form.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span><del>- if ( 'category' == $taxonomy )
</del><ins>+ if ( 'category' == $taxonomy )
</ins><span class="cx"> do_action('edit_category_form_fields', $tag);
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_tag_form_fields', $tag);
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </table>
</span><span class="cx"> <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
</span><del>-<?php
-if ( 'category' == $taxonomy )
</del><ins>+<?php
+if ( 'category' == $taxonomy )
</ins><span class="cx"> do_action('edit_category_form_', $tag);
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_tag_form_', $tag);
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/edit-tags.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -328,8 +328,8 @@
</span><span class="cx"> <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php
-if ( 'category' == $taxonomy )
</del><ins>+<?php
+if ( 'category' == $taxonomy )
</ins><span class="cx"> do_action('add_category_form_fields');
</span><span class="cx"> else
</span><span class="cx"> do_action('add_tag_form_fields', $taxonomy);
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if ( ! $overwrite && $this->exists($destination) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // try using rename first. if that fails (for example, source is read only) try copy
</del><ins>+ // try using rename first. if that fails (for example, source is read only) try copy
</ins><span class="cx"> if ( @rename($source, $destination) )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/includes/file.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -565,17 +565,17 @@
</span><span class="cx"> else
</span><span class="cx"> $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> asort($needed_dirs);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Create those directories if need be:
</span><span class="cx"> foreach ( $needed_dirs as $_dir ) {
</span><span class="cx"> if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
</span><span class="cx"> return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
</span><span class="cx"> }
</span><span class="cx"> unset($needed_dirs);
</span><del>-
</del><ins>+
</ins><span class="cx"> for ( $i = 0; $i < $z->numFiles; $i++ ) {
</span><span class="cx"> if ( ! $info = $z->statIndex($i) )
</span><span class="cx"> return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/includes/post.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> foreach ( $draft_ids as $temp => $real )
</span><span class="cx"> if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then )
</span><span class="cx"> unset($draft_ids[$temp]);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write
</span><span class="cx"> $_POST['post_ID'] = $draft_ids[$temp_id];
</span><span class="cx"> unset($_POST['temp_ID']);
</span></span></pre></div>
<a id="trunkwpadminjspostdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.dev.js (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.dev.js 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/js/post.dev.js 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -253,15 +253,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // categories
</span><del>- $('.categorydiv').each(function(){
- var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats;
- var taxonomy_parts = this_id.split('-');
</del><ins>+ $('.categorydiv').each(function(){
+ var this_id = $(this).attr('id'), noSyncChecks = false, syncChecks, catAddAfter, popularCats;
+ var taxonomy_parts = this_id.split('-');
</ins><span class="cx"> taxonomy_parts.shift();
</span><span class="cx"> var taxonomy = taxonomy_parts.join('-');
</span><del>- var settingName = taxonomy+'_tab';
- if(taxonomy == 'category')
- settingName = 'cats';
-
</del><ins>+ var settingName = taxonomy+'_tab';
+ if(taxonomy == 'category')
+ settingName = 'cats';
+
</ins><span class="cx"> // TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.dev.js
</span><span class="cx"> $('a', '#'+taxonomy+'-tabs').click(function(){
</span><span class="cx"> var t = $(this).attr('href');
</span><span class="lines">@@ -274,25 +274,25 @@
</span><span class="cx"> setUserSetting(settingName,'pop');
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( getUserSetting(settingName) )
</span><span class="cx"> $('a[href="#'+taxonomy+'-pop"]', '#'+taxonomy+'-tabs').click();
</span><span class="cx">
</span><span class="cx"> // Ajax Cat
</span><del>- $('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
- $('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();});
-
- syncChecks = function() {
- if ( noSyncChecks )
- return;
- noSyncChecks = true;
- var th = jQuery(this), c = th.is(':checked'), id = th.val().toString();
- $('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c );
- noSyncChecks = false;
- };
-
-
-
</del><ins>+ $('#new'+taxonomy).one( 'focus', function() { $(this).val( '' ).removeClass( 'form-input-tip' ) } );
+ $('#'+taxonomy+'-add-submit').click(function(){$('#new'+taxonomy).focus();});
+
+ syncChecks = function() {
+ if ( noSyncChecks )
+ return;
+ noSyncChecks = true;
+ var th = jQuery(this), c = th.is(':checked'), id = th.val().toString();
+ $('#in-'+taxonomy+'-' + id + ', #in-'+taxonomy+'-category-' + id).attr( 'checked', c );
+ noSyncChecks = false;
+ };
+
+
+
</ins><span class="cx"> catAddBefore = function( s ) {
</span><span class="cx"> if ( !$('#new'+taxonomy).val() )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-admin/network.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> case 'step2':
</span><span class="cx"> check_admin_referer( 'install-network-1' );
</span><span class="cx">
</span><del>- if ( isset( $_POST[ 'existing_network' ] ) ) {
</del><ins>+ if ( isset( $_POST[ 'existing_network' ] ) ) {
</ins><span class="cx"> // Install!
</span><span class="cx"> $base = stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) );
</span><span class="cx"> if ( $base != '/' )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyten404php"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/404.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/404.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/404.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="post-0" class="post error404 not-found">
</span><span class="cx"> <h1 class="entry-title">Not Found</h1>
</span><span class="cx"> <div class="entry-content">
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div><!-- #post-0 -->
</span><span class="cx">
</span><del>- </div><!-- #content -->
</del><ins>+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> // focus on search field after it has loaded
</span><span class="cx"> document.getElementById('s') && document.getElementById('s').focus();
</span><del>- </script>
</del><ins>+ </script>
</ins><span class="cx">
</span><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
-<?php the_post(); ?>
-
</del><ins>+
+<?php the_post(); ?>
+
</ins><span class="cx"> <?php if ( is_day() ) : ?>
</span><span class="cx"> <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_time(get_option('date_format')) ) ?></h1>
</span><span class="cx"> <?php elseif ( is_month() ) : ?>
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><del>- <div class="entry-summary">
</del><ins>+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="lines">@@ -47,20 +47,20 @@
</span><span class="cx"> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php endwhile; ?>
</del><ins>+<?php endwhile; ?>
</ins><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
-
- </div><!-- #content -->
</del><ins>+<?php } ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,46 +1,46 @@
</span><span class="cx"> <?php get_header(); ?>
</span><span class="cx">
</span><del>- <div id="container">
</del><ins>+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( __( 'Return to %s', 'twentyten' ), wp_specialchars( get_the_title($post->post_parent), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent) ?></a></p>
</span><del>-
</del><ins>+
</ins><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><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span>
</span><span class="cx"> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
</span><span class="cx"> <span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php the_time( get_option( 'date_format' ) ); ?></abbr></span>
</span><del>- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</del><ins>+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-content">
</span><del>- <div class="entry-attachment">
</del><ins>+ <div class="entry-attachment">
</ins><span class="cx"> <?php if ( wp_attachment_is_image( $post->id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?>
</span><span class="cx"> <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php the_title(); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>" class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
</span><span class="cx"> </p>
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_image_link( false ); ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_image_link( false ); ?></div>
</span><del>- </div><!-- #nav-below -->
-<?php else : ?>
- <a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo wp_specialchars( get_the_title($post->ID), 1 ) ?>" rel="attachment"><?php echo basename($post->guid) ?></a>
-<?php endif; ?>
- </div>
</del><ins>+ </div><!-- #nav-below -->
+<?php else : ?>
+ <a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo wp_specialchars( get_the_title($post->ID), 1 ) ?>" rel="attachment"><?php echo basename($post->guid) ?></a>
+<?php endif; ?>
+ </div>
</ins><span class="cx"> <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
</span><span class="cx">
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .entry-content -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
</span><span class="cx"> get_the_category_list(', '),
</span><span class="lines">@@ -67,5 +67,5 @@
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><del>-<?php get_sidebar(); ?>
</del><ins>+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/author.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,32 +1,32 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
-<?php the_post(); ?>
-
</del><ins>+
+<?php the_post(); ?>
+
</ins><span class="cx"> <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='$authordata->display_name' rel='me'>$authordata->display_name</a>" ) ?></h1>
</span><span class="cx">
</span><del>-<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</del><ins>+<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</ins><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><span class="cx"> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</span><del>- </div><!-- #author-avatar -->
</del><ins>+ </div><!-- #author-avatar -->
</ins><span class="cx"> <div id="author-description">
</span><del>- <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</del><ins>+ <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</ins><span class="cx"> <?php the_author_meta('description'); ?>
</span><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
- <div class="entry-summary">
</del><ins>+
+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="lines">@@ -49,20 +49,20 @@
</span><span class="cx"> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php endwhile; ?>
</del><ins>+<?php endwhile; ?>
</ins><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
-
- </div><!-- #content -->
</del><ins>+<?php } ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/category.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,22 +1,22 @@
</span><span class="cx">
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
-<?php the_post(); ?>
-
</del><ins>+
+<?php the_post(); ?>
+
</ins><span class="cx"> <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1>
</span><span class="cx"> <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="lines">@@ -28,13 +28,13 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
- <div class="entry-summary">
</del><ins>+
+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?>
</span><span class="cx"> <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span>
</span><span class="lines">@@ -43,20 +43,20 @@
</span><span class="cx"> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php endwhile; ?>
</del><ins>+<?php endwhile; ?>
</ins><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
-
- </div><!-- #content -->
</del><ins>+<?php } ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyteneditorstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/editor-style.css (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/editor-style.css 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/editor-style.css 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> textarea {
</span><span class="cx"> color: #444;
</span><span class="cx"> font-size: 16px;
</span><del>- line-height: 24px;
</del><ins>+ line-height: 24px;
</ins><span class="cx"> }
</span><span class="cx"> p,
</span><span class="cx"> ul,
</span><span class="lines">@@ -205,26 +205,26 @@
</span><span class="cx"> h6 {
</span><span class="cx"> font-size: 0.9em;
</span><span class="cx"> }
</span><del>-table {
- border: 1px solid #e7e7e7 !important;
- text-align: left;
- margin: 0 -1px 24px 0;
- width: 100%;
</del><ins>+table {
+ border: 1px solid #e7e7e7 !important;
+ text-align: left;
+ margin: 0 -1px 24px 0;
+ width: 100%;
</ins><span class="cx"> border-collapse: collapse;
</span><span class="cx"> border-spacing: 0;
</span><del>-}
-tr th,
</del><ins>+}
+tr th,
</ins><span class="cx"> thead th {
</span><span class="cx"> border: none !important;
</span><del>- color: #888;
- font-size: 12px;
- font-weight: bold;
- line-height: 18px;
- padding: 9px 24px;
-}
</del><ins>+ color: #888;
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 18px;
+ padding: 9px 24px;
+}
</ins><span class="cx"> tr td {
</span><span class="cx"> border: none !important;
</span><del>- border-top: 1px solid #e7e7e7 !important;
</del><ins>+ border-top: 1px solid #e7e7e7 !important;
</ins><span class="cx"> padding: 6px 24px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> -moz-border-radius: 0;
</span><span class="cx"> -khtml-border-radius: 0;
</span><span class="cx"> -webkit-border-radius: 0;
</span><del>- border-radius: 0;
</del><ins>+ border-radius: 0;
</ins><span class="cx"> }
</span><span class="cx"> .wp-caption img {
</span><span class="cx"> margin: 5px;
</span><span class="lines">@@ -277,6 +277,6 @@
</span><span class="cx"> .wp-caption p.wp-caption-text {
</span><span class="cx"> margin: 0 0 4px;
</span><span class="cx"> }
</span><del>-.wp-smiley {
</del><ins>+.wp-smiley {
</ins><span class="cx"> margin:0;
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> // Set the content width based on the Theme CSS
</span><span class="cx"> $content_width = apply_filters('twentyten_content_width', 640 );
</span><span class="cx">
</span><del>-// Your Changeable header business starts here
</del><ins>+// Your Changeable header business starts here
</ins><span class="cx"> // No CSS, just IMG call
</span><span class="cx"> define( 'HEADER_TEXTCOLOR', '');
</span><span class="cx"> define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <div class="reply">
</span><span class="cx"> <?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
</span><span class="cx"> </div>
</span><del>- </div>
</del><ins>+ </div>
</ins><span class="cx">
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <li class="post pingback">
</span><span class="lines">@@ -178,62 +178,62 @@
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Area 2
</span><span class="cx"> register_sidebar( array (
</span><span class="cx"> 'name' => 'Secondary Widget Area',
</span><del>- 'id' => 'secondary-widget-area',
</del><ins>+ 'id' => 'secondary-widget-area',
</ins><span class="cx"> 'description' => __('The secondary widget area' , 'twentyten'),
</span><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Area 3
</span><span class="cx"> register_sidebar( array (
</span><span class="cx"> 'name' => 'First Footer Widget Area',
</span><del>- 'id' => 'first-footer-widget-area',
</del><ins>+ 'id' => 'first-footer-widget-area',
</ins><span class="cx"> 'description' => __('The first footer widget area' , 'twentyten'),
</span><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><del>- ) );
</del><ins>+ ) );
</ins><span class="cx">
</span><span class="cx"> // Area 4
</span><span class="cx"> register_sidebar( array (
</span><span class="cx"> 'name' => 'Second Footer Widget Area',
</span><del>- 'id' => 'second-footer-widget-area',
</del><ins>+ 'id' => 'second-footer-widget-area',
</ins><span class="cx"> 'description' => __('The second footer widget area' , 'twentyten'),
</span><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><del>- ) );
</del><ins>+ ) );
</ins><span class="cx">
</span><span class="cx"> // Area 5
</span><span class="cx"> register_sidebar( array (
</span><span class="cx"> 'name' => 'Third Footer Widget Area',
</span><del>- 'id' => 'third-footer-widget-area',
</del><ins>+ 'id' => 'third-footer-widget-area',
</ins><span class="cx"> 'description' => __('The third footer widget area' , 'twentyten'),
</span><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><del>- ) );
</del><ins>+ ) );
</ins><span class="cx">
</span><span class="cx"> // Area 6
</span><span class="cx"> register_sidebar( array (
</span><span class="cx"> 'name' => 'Fourth Footer Widget Area',
</span><del>- 'id' => 'fourth-footer-widget-area',
</del><ins>+ 'id' => 'fourth-footer-widget-area',
</ins><span class="cx"> 'description' => __('The fourth footer widget area' , 'twentyten'),
</span><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h3>',
</span><del>- ) );
-
</del><ins>+ ) );
+
</ins><span class="cx"> } // end theme_widgets_init
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -2,27 +2,27 @@
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <title><?php
</span><del>- if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); }
</del><ins>+ if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); }
</ins><span class="cx"> elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); }
</span><span class="cx"> elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); }
</span><span class="cx"> elseif ( is_search() ) { print 'Search results for ' . wp_specialchars($s); get_page_number(); print ' | '; bloginfo('name'); }
</span><span class="cx"> elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); }
</span><span class="cx"> else { bloginfo('name'); wp_title('|'); get_page_number(); }
</span><span class="cx"> ?></title>
</span><del>-
</del><ins>+
</ins><span class="cx"> <meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
</span><del>-
</del><ins>+
</ins><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 class="cx"> <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php wp_head(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( __( '%s latest posts', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
</span><span class="cx"> <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( __( '%s latest comments', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
</span><del>- <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</del><ins>+ <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</ins><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class(); ?>>
</span><span class="lines">@@ -30,11 +30,11 @@
</span><span class="cx">
</span><span class="cx"> <div id="header">
</span><span class="cx"> <div id="masthead">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="branding">
</span><span class="cx"> <div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
</span><span class="cx"> <div id="site-description"><?php bloginfo( 'description' ) ?></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> global $post;
</span><span class="cx"> if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div><!-- #branding -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="access">
</span><span class="cx"> <div class="skip-link screen-reader-text"><a href="#content" title="<?php _e( 'Skip to content', 'twentyten' ) ?>"><?php _e( 'Skip to content', 'twentyten' ) ?></a></div>
</span><del>- <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</del><ins>+ <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</ins><span class="cx"> </div><!-- #access -->
</span><del>-
- </div><!-- #masthead -->
</del><ins>+
+ </div><!-- #masthead -->
</ins><span class="cx"> </div><!-- #header -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="main">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/page.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/page.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/page.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,23 +1,23 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php the_post(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php the_content(); ?>
</span><del>-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</del><ins>+<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</ins><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><del>- </div><!-- #post-<?php the_ID(); ?> -->
-
-<?php comments_template(); ?>
-
- </div><!-- #content -->
</del><ins>+ </div><!-- #post-<?php the_ID(); ?> -->
+
+<?php comments_template(); ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenprintcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/print.css (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/print.css 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/print.css 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> This stylesheet reformats the theme for the printed page.
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/rtl.css (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/rtl.css 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/rtl.css 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> Theme Name: Twenty Ten
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-/* --------------------------------------------------------------
-
</del><ins>+/* --------------------------------------------------------------
+
</ins><span class="cx"> RTL Basics
</span><del>-
</del><ins>+
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> /* =Fonts
</span><span class="cx"> -------------------------------------------------------------- */
</span><del>-body,
-input,
</del><ins>+body,
+input,
</ins><span class="cx"> textarea,
</span><span class="cx"> .page-title span {
</span><span class="cx"> font-family: Georgia, "Bitstream Charter", serif;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> .comment-body thead th,
</span><span class="cx"> .entry-content label,
</span><span class="cx"> .entry-content tr th,
</span><del>-.entry-content thead th,
</del><ins>+.entry-content thead th,
</ins><span class="cx"> .entry-meta,
</span><span class="cx"> .entry-title,
</span><span class="cx"> .entry-utility,
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #access .menu {
</span><del>- margin-right: 12px;
- margin-left: 0;
</del><ins>+ margin-right: 12px;
+ margin-left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -149,21 +149,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #access ul ul {
</span><del>- left:auto;
</del><ins>+ left:auto;
</ins><span class="cx"> right:0;
</span><span class="cx"> float:right;
</span><span class="cx"> }
</span><span class="cx"> #access ul ul ul {
</span><del>- left:auto;
- right:100%;
</del><ins>+ left:auto;
+ right:100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* =Content
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-#content table {
- text-align: right;
- margin: 0 0 24px -1px;
</del><ins>+#content table {
+ text-align: right;
+ margin: 0 0 24px -1px;
</ins><span class="cx"> }
</span><span class="cx"> .entry-title,
</span><span class="cx"> .entry-meta {
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> margin: 0 104px 0 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Gallery listing
</del><ins>+/* Gallery listing
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> .category-gallery .gallery-thumb {
</span><span class="lines">@@ -207,14 +207,14 @@
</span><span class="cx"> margin-left:20px;
</span><span class="cx"> margin-right:0;
</span><span class="cx"> }
</span><del>-#content .gallery .gallery-item {
- float: right;
</del><ins>+#content .gallery .gallery-item {
+ float: right;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* =Images
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-#content .gallery .gallery-caption {
</del><ins>+#content .gallery .gallery-caption {
</ins><span class="cx"> margin-right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/search.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,48 +1,48 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( have_posts() ) : ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post() ?>
</span><span class="cx">
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</span><span class="cx">
</span><del>-<?php if ( $post->post_type == 'post' ) { ?>
</del><ins>+<?php if ( $post->post_type == 'post' ) { ?>
</ins><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php } ?>
</span><del>-
- <div class="entry-summary">
</del><ins>+
+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><del>-<?php if ( $post->post_type == 'post' ) { ?>
</del><ins>+<?php if ( $post->post_type == 'post' ) { ?>
</ins><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</span><del>- </div><!-- #entry-utility -->
-<?php } ?>
</del><ins>+ </div><!-- #entry-utility -->
+<?php } ?>
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="lines">@@ -60,14 +60,14 @@
</span><span class="cx"> <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2>
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
</span><del>- <?php get_search_form(); ?>
</del><ins>+ <?php get_search_form(); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><del>- </div><!-- #content -->
</del><ins>+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar-footer.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> <?php dynamic_sidebar('first-footer-widget-area'); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #first .widget-area -->
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar('second-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="second" class="widget-area">
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> <?php dynamic_sidebar('second-footer-widget-area'); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #second .widget-area -->
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar('third-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="third" class="widget-area">
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> <?php dynamic_sidebar('third-footer-widget-area'); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #third .widget-area -->
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="fourth" class="widget-area">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <?php dynamic_sidebar('fourth-footer-widget-area'); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #fourth .widget-area -->
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #footer-widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/sidebar.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <?php wp_get_archives('type=monthly') ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </li>
</span><del>-
</del><ins>+
</ins><span class="cx"> <li id="meta" class="widget-container">
</span><span class="cx"> <h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3>
</span><span class="cx"> <ul>
</span><span class="lines">@@ -21,11 +21,11 @@
</span><span class="cx"> <?php wp_meta() ?>
</span><span class="cx">
</span><span class="cx"> </ul>
</span><del>- </li>
</del><ins>+ </li>
</ins><span class="cx"> <?php endif; // end primary widget area ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #primary .widget-area -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
</span><span class="cx"> <div id="secondary" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/single.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="lines">@@ -12,36 +12,36 @@
</span><span class="cx">
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span>
</span><span class="cx"> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</span><span class="cx"> <span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><del>- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</del><ins>+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php the_content(); ?>
</span><span class="cx"> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><del>-<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</del><ins>+<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</ins><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><span class="cx"> <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</span><del>- </div><!-- #author-avatar -->
</del><ins>+ </div><!-- #author-avatar -->
</ins><span class="cx"> <div id="author-description">
</span><del>- <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</del><ins>+ <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</ins><span class="cx"> <?php the_author_meta('description'); ?>
</span><span class="cx"> <div id="author-link">
</span><span class="cx"> <a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php _e('View all posts by ', 'twentyten'); ?><?php the_author(); ?> &rarr;</a>
</span><del>- </div><!-- #author-link -->
</del><ins>+ </div><!-- #author-link -->
</ins><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
</span><span class="cx"> get_the_category_list(', '),
</span><span class="lines">@@ -51,18 +51,18 @@
</span><span class="cx"> get_post_comments_feed_link() ) ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
</span><del>- </div><!-- .entry-utility -->
- </div><!-- #post-<?php the_ID(); ?> -->
-
</del><ins>+ </div><!-- .entry-utility -->
+ </div><!-- #post-<?php the_ID(); ?> -->
+
</ins><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
</span><del>- </div><!-- #nav-below -->
</del><ins>+ </div><!-- #nav-below -->
</ins><span class="cx">
</span><del>-<?php comments_template('', true); ?>
-
- </div><!-- #content -->
</del><ins>+<?php comments_template('', true); ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/style.css (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/style.css 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/style.css 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> Theme Name: Twenty Ten
</span><span class="cx"> Theme URI: http://wordpress.org/
</span><span class="cx"> Description: The 2010 default theme for WordPress.
</span><span class="lines">@@ -8,13 +8,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-/* --------------------------------------------------------------
-
</del><ins>+/* --------------------------------------------------------------
+
</ins><span class="cx"> Reset default browser CSS.
</span><del>-
</del><ins>+
</ins><span class="cx"> Based on work by Eric Meyer:
</span><span class="cx"> http://meyerweb.com/eric/tools/css/reset/index.html
</span><del>-
</del><ins>+
</ins><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> html, body, div, span, applet, object, iframe,
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> body {
</span><span class="cx"> line-height: 1;
</span><span class="cx"> }
</span><del>-h1,h2,h3,h4,h5,h6 {
</del><ins>+h1,h2,h3,h4,h5,h6 {
</ins><span class="cx"> font-weight: normal;
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx">
</span><span class="cx"> /* =Fonts
</span><span class="cx"> -------------------------------------------------------------- */
</span><del>-body,
-input,
</del><ins>+body,
+input,
</ins><span class="cx"> textarea,
</span><span class="cx"> .page-title span,
</span><span class="cx"> .pingback a.url {
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> .comment-body thead th,
</span><span class="cx"> .entry-content label,
</span><span class="cx"> .entry-content tr th,
</span><del>-.entry-content thead th,
</del><ins>+.entry-content thead th,
</ins><span class="cx"> .entry-meta,
</span><span class="cx"> .entry-title,
</span><span class="cx"> .entry-utility,
</span><span class="lines">@@ -360,16 +360,16 @@
</span><span class="cx"> }
</span><span class="cx"> #access a {
</span><span class="cx"> display:block;
</span><del>- text-decoration:none;
- color:#aaa;
</del><ins>+ text-decoration:none;
+ color:#aaa;
</ins><span class="cx"> padding:0 10px;
</span><del>- line-height:38px;
</del><ins>+ line-height:38px;
</ins><span class="cx"> }
</span><span class="cx"> #access ul ul {
</span><span class="cx"> display:none;
</span><span class="cx"> position:absolute;
</span><span class="cx"> top:38px;
</span><del>- left:0;
</del><ins>+ left:0;
</ins><span class="cx"> float:left;
</span><span class="cx"> -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
</span><span class="cx"> -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
</span><span class="lines">@@ -377,19 +377,19 @@
</span><span class="cx"> z-index: 99999;
</span><span class="cx"> }
</span><span class="cx"> #access ul ul ul {
</span><del>- left:100%;
- top:0;
</del><ins>+ left:100%;
+ top:0;
</ins><span class="cx"> }
</span><span class="cx"> #access ul ul a {
</span><del>- background:#333;
- height:auto;
- line-height:1em;
- padding:10px;
</del><ins>+ background:#333;
+ height:auto;
+ line-height:1em;
+ padding:10px;
</ins><span class="cx"> width: 130px;
</span><span class="cx"> }
</span><del>-#access li:hover > a,
</del><ins>+#access li:hover > a,
</ins><span class="cx"> #access ul ul :hover > a {
</span><del>- color:#fff;
</del><ins>+ color:#fff;
</ins><span class="cx"> background:#333;
</span><span class="cx"> }
</span><span class="cx"> #access ul li:hover > ul {
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> #content textarea {
</span><span class="cx"> color: #444;
</span><span class="cx"> font-size: 16px;
</span><del>- line-height: 24px;
</del><ins>+ line-height: 24px;
</ins><span class="cx"> }
</span><span class="cx"> #content p,
</span><span class="cx"> #content ul,
</span><span class="lines">@@ -455,25 +455,25 @@
</span><span class="cx"> margin: 0 0 20px 0;
</span><span class="cx"> line-height: 1.5em;
</span><span class="cx"> }
</span><del>-#content table {
- border: 1px solid #e7e7e7;
- text-align: left;
- margin: 0 -1px 24px 0;
- width: 100%;
-}
-#content tr th,
-#content thead th {
- color: #888;
- font-size: 12px;
- font-weight: bold;
- line-height: 18px;
- padding: 9px 24px;
-}
-#content tr td {
- border-top: 1px solid #e7e7e7;
- padding: 6px 24px;
</del><ins>+#content table {
+ border: 1px solid #e7e7e7;
+ text-align: left;
+ margin: 0 -1px 24px 0;
+ width: 100%;
</ins><span class="cx"> }
</span><del>-#content tr.odd td {
</del><ins>+#content tr th,
+#content thead th {
+ color: #888;
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 18px;
+ padding: 9px 24px;
+}
+#content tr td {
+ border-top: 1px solid #e7e7e7;
+ padding: 6px 24px;
+}
+#content tr.odd td {
</ins><span class="cx"> background: #F2F7FC;
</span><span class="cx"> }
</span><span class="cx"> .hentry {
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> /* Gallery listing
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.category-gallery {
</del><ins>+.category-gallery {
</ins><span class="cx"> margin-bottom: 48px;
</span><span class="cx"> }
</span><span class="cx"> .category-gallery h2 {
</span><span class="lines">@@ -767,7 +767,7 @@
</span><span class="cx"> #content .wp-caption p.wp-caption-text {
</span><span class="cx"> margin: 0 0 4px;
</span><span class="cx"> }
</span><del>-#content .wp-smiley {
</del><ins>+#content .wp-smiley {
</ins><span class="cx"> margin:0;
</span><span class="cx"> }
</span><span class="cx"> #content .gallery {
</span><span class="lines">@@ -874,7 +874,7 @@
</span><span class="cx"> #comments .comment-body ol {
</span><span class="cx"> margin-bottom: 18px;
</span><span class="cx"> }
</span><del>-#comments .comment-body p:last-child {
</del><ins>+#comments .comment-body p:last-child {
</ins><span class="cx"> margin-bottom: 6px;
</span><span class="cx"> }
</span><span class="cx"> #comments .comment-body blockquote p:last-child {
</span><span class="lines">@@ -997,10 +997,10 @@
</span><span class="cx"> #form-allowed-tags {
</span><span class="cx"> color:#888;
</span><span class="cx"> font-size: 12px;
</span><del>- line-height: 18px;
</del><ins>+ line-height: 18px;
</ins><span class="cx"> }
</span><span class="cx"> #form-allowed-tags p {
</span><del>- margin:0;
</del><ins>+ margin:0;
</ins><span class="cx"> }
</span><span class="cx"> #form-allowed-tags span {
</span><span class="cx"> }
</span><span class="lines">@@ -1095,7 +1095,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Footer widget areas */
</span><del>-#footer-widget-area {
</del><ins>+#footer-widget-area {
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -1,20 +1,20 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
-<?php the_post(); ?>
-
</del><ins>+
+<?php the_post(); ?>
+
</ins><span class="cx"> <h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php } ?>
</ins><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><span class="lines">@@ -25,35 +25,35 @@
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
- <div class="entry-summary">
</del><ins>+
+ <div class="entry-summary">
</ins><span class="cx"> <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><del>-<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
</del><ins>+<?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
</ins><span class="cx"> <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span>
</span><del>-<?php endif; ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php endwhile; ?>
</del><ins>+<?php endwhile; ?>
</ins><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
-
- </div><!-- #content -->
</del><ins>+<?php } ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-includes/default-constants.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> */
</span><span class="cx"> define('STYLESHEETPATH', get_stylesheet_directory());
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Slug of the fallback theme for this install.
</span><span class="cx"> * Will be used as the fallback if the current theme doesn't exist.
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-includes/ms-load.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> $current_site->cookie_domain = $cookie_domain;
</span><span class="cx"> return $current_site;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="cx"> $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
</span><span class="cx"> $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (13024 => 13025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-02-08 17:59:08 UTC (rev 13024)
+++ trunk/wp-includes/post-template.php 2010-02-08 18:02:23 UTC (rev 13025)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_single() ) {
</span><span class="cx"> $postID = $wp_query->get_queried_object_id();
</span><del>-
</del><ins>+
</ins><span class="cx"> $classes[] = 'single postid-' . $postID;
</span><span class="cx">
</span><span class="cx"> if ( is_attachment() ) {
</span></span></pre>
</div>
</div>
</body>
</html>