<!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>[13157] trunk/wp-content/themes/twentyten: Twentyten whitespace cleanup,
  Wrap functions in function_exists()
  call to allow child themes to override them.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13157">13157</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-14 21:39:20 +0000 (Sun, 14 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twentyten whitespace cleanup, Wrap functions in function_exists() call to allow child themes to override them. Props sivel. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13156 => 13157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php        2010-02-14 21:27:55 UTC (rev 13156)
+++ trunk/wp-content/themes/twentyten/attachment.php        2010-02-14 21:39:20 UTC (rev 13157)
</span><span class="lines">@@ -21,23 +21,23 @@
</span><span class="cx"> 
</span><span class="cx">                                         &lt;div class=&quot;entry-content&quot;&gt;
</span><span class="cx">                                                 &lt;div class=&quot;entry-attachment&quot;&gt;
</span><del>-                                                &lt;?php if ( wp_attachment_is_image() ) : ?&gt;
-                                                        &lt;p class=&quot;attachment&quot;&gt;&lt;a href=&quot;&lt;?php echo wp_get_attachment_url(); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php
-                                                                echo wp_get_attachment_image( $post-&gt;ID, array($content_width, $content_width) ); // max $content_width wide or high.
-                                                        ?&gt;&lt;/a&gt;&lt;/p&gt;
</del><ins>+&lt;?php if ( wp_attachment_is_image() ) : ?&gt;
+                                                &lt;p class=&quot;attachment&quot;&gt;&lt;a href=&quot;&lt;?php echo wp_get_attachment_url(); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php
+                                                        echo wp_get_attachment_image( $post-&gt;ID, array( $content_width, $content_width ) ); // max $content_width wide or high.
+                                                ?&gt;&lt;/a&gt;&lt;/p&gt;
</ins><span class="cx"> 
</span><del>-                                                        &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
-                                                                &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_image_link( false ); ?&gt;&lt;/div&gt;
-                                                                &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_image_link( false ); ?&gt;&lt;/div&gt;
-                                                        &lt;/div&gt;&lt;!-- #nav-below --&gt;
-                                                &lt;?php else : ?&gt;
-                                                        &lt;a href=&quot;&lt;?php echo wp_get_attachment_url(); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php echo basename(get_permalink()); ?&gt;&lt;/a&gt;
-                                                &lt;?php endif; ?&gt;
</del><ins>+                                                &lt;div id=&quot;nav-below&quot; class=&quot;navigation&quot;&gt;
+                                                        &lt;div class=&quot;nav-previous&quot;&gt;&lt;?php previous_image_link( false ); ?&gt;&lt;/div&gt;
+                                                        &lt;div class=&quot;nav-next&quot;&gt;&lt;?php next_image_link( false ); ?&gt;&lt;/div&gt;
+                                                &lt;/div&gt;&lt;!-- #nav-below --&gt;
+&lt;?php else : ?&gt;
+                                                &lt;a href=&quot;&lt;?php echo wp_get_attachment_url(); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_the_title() ); ?&gt;&quot; rel=&quot;attachment&quot;&gt;&lt;?php echo basename( get_permalink() ); ?&gt;&lt;/a&gt;
+&lt;?php endif; ?&gt;
</ins><span class="cx">                                                 &lt;/div&gt;
</span><span class="cx">                                                 &lt;div class=&quot;entry-caption&quot;&gt;&lt;?php if ( !empty($post-&gt;post_excerpt) ) the_excerpt(); ?&gt;&lt;/div&gt;
</span><span class="cx"> 
</span><del>-                                                &lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyten' )  ); ?&gt;
-                                                &lt;?php wp_link_pages( 'before=&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyten' ) . '&amp;after=&lt;/div&gt;' ); ?&gt;
</del><ins>+&lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyten' )  ); ?&gt;
+&lt;?php wp_link_pages( 'before=&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyten' ) . '&amp;after=&lt;/div&gt;' ); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                         &lt;/div&gt;&lt;!-- .entry-content --&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13156 => 13157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php        2010-02-14 21:27:55 UTC (rev 13156)
+++ trunk/wp-content/themes/twentyten/functions.php        2010-02-14 21:39:20 UTC (rev 13157)
</span><span class="lines">@@ -1,16 +1,47 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><span class="cx"> // Set the content width based on the Theme CSS
</span><del>-$content_width = apply_filters( 'twentyten_content_width', 640 );
</del><ins>+if ( ! isset( $content_width ) )
+   $content_width = 640;
</ins><span class="cx"> 
</span><del>-// Your Changeable header business starts here
-// No CSS, just IMG call
-define( 'HEADER_TEXTCOLOR', '');
-define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri
-define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width',  940 ) );
-define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height',  198 ) );
-define( 'NO_HEADER_TEXT', true );
</del><ins>+if ( ! function_exists( 'twentyten_init' ) ) :
+function twentyten_init() {
+        // Your Changeable header business starts here
+        // No CSS, just IMG call
+        define( 'HEADER_TEXTCOLOR', '');
+        define( 'HEADER_IMAGE', '%s/images/header-1.jpg'); // %s is theme dir uri
+        define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width',  940 ) );
+        define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height',        198 ) );
+        define( 'NO_HEADER_TEXT', true );
</ins><span class="cx"> 
</span><ins>+        add_custom_image_header( '', 'twentyten_admin_header_style' );
+        // and thus ends the changeable header business
+
+        add_custom_background();
+
+        // This theme needs post thumbnails
+        add_theme_support( 'post-thumbnails' );
+
+        // We'll be using them for custom header images on posts and pages
+        // so we want them to be 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit)
+        set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
+
+        // Add default posts and comments RSS feed links to head.
+        automatic_feed_links();
+
+        // Make theme available for translation
+        // Translations can be filed in the /languages/ directory
+        load_theme_textdomain( 'twentyten', TEMPLATEPATH . '/languages' );
+
+        $locale = get_locale();
+        $locale_file = TEMPLATEPATH . &quot;/languages/$locale.php&quot;;
+        if ( is_readable( $locale_file ) )
+                require_once( $locale_file );
+}
+endif;
+add_action( 'themes_loaded', 'twentyten_init' );
+
+if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
</ins><span class="cx"> function twentyten_admin_header_style() {
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;style type=&quot;text/css&quot;&gt;
</span><span class="lines">@@ -24,84 +55,77 @@
</span><span class="cx"> &lt;/style&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx"> 
</span><del>-add_custom_image_header( '', 'twentyten_admin_header_style' );
-// and thus ends the changeable header business
-
-add_custom_background();
-
-// This theme needs post thumbnails
-add_theme_support( 'post-thumbnails' );
-
-// We'll be using them for custom header images on posts and pages
-// so we want them to be 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit)
-set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
-
-// Add default posts and comments RSS feed links to head.
-automatic_feed_links();
-
-// Make theme available for translation
-// Translations can be filed in the /languages/ directory
-load_theme_textdomain( 'twentyten', TEMPLATEPATH . '/languages' );
-
-$locale = get_locale();
-$locale_file = TEMPLATEPATH . &quot;/languages/$locale.php&quot;;
-if ( is_readable($locale_file) )
-        require_once( $locale_file );
-
</del><span class="cx"> // Get the page number
</span><ins>+if ( ! function_exists( 'twentyten_get_page_number' ) ) :
</ins><span class="cx"> function twentyten_get_page_number() {
</span><span class="cx">         if ( get_query_var('paged') )
</span><del>-                echo ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');
</del><ins>+                return ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
</ins><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx"> 
</span><ins>+// Echo the page number
+if ( ! function_exists( 'twentyten_the_page_number' ) ) :
+function twentyten_the_page_number() {
+        echo twentyten_get_page_number();
+}
+endif;
+
</ins><span class="cx"> // Control excerpt length
</span><del>-function twentyten_new_excerpt_length( $length ) {
</del><ins>+if ( ! function_exists( 'twentyten_excerpt_length' ) ) :
+function twentyten_excerpt_length( $length ) {
</ins><span class="cx">         return 40;
</span><span class="cx"> }
</span><del>-add_filter( 'excerpt_length', 'twentyten_new_excerpt_length' );
</del><ins>+endif;
+add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> // Make a nice read more link on excerpts
</span><del>-function twentyten_new_excerpt_more($more) {
</del><ins>+if ( ! function_exists( 'twentyten_excerpt_more' ) ) :
+function twentyten_excerpt_more($more) {
</ins><span class="cx">         return '&amp;nbsp;&amp;hellip; &lt;a href=&quot;'. get_permalink() . '&quot;&gt;' . 'Continue&amp;nbsp;reading&amp;nbsp;&lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;' . '&lt;/a&gt;';
</span><span class="cx"> }
</span><del>-add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' );
</del><ins>+endif;
+add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> // Template for comments and pingbacks
</span><del>-function twentyten_list_comment( $comment, $args, $depth ) {
-        $GLOBALS['comment'] = $comment; ?&gt;
-        &lt;?php if ( '' == $comment-&gt;comment_type ) { ?&gt;
</del><ins>+if ( ! function_exists( 'twentyten_comment' ) ) :
+function twentyten_comment( $comment, $args, $depth ) {
+        $GLOBALS ['comment'] = $comment; ?&gt;
+        &lt;?php if ( '' == $comment-&gt;comment_type ) : ?&gt;
</ins><span class="cx">         &lt;li &lt;?php comment_class(); ?&gt; id=&quot;li-comment-&lt;?php comment_ID(); ?&gt;&quot;&gt;
</span><span class="cx">                 &lt;div id=&quot;comment-&lt;?php comment_ID(); ?&gt;&quot;&gt;
</span><span class="cx">                 &lt;div class=&quot;comment-author vcard&quot;&gt;
</span><span class="cx">                         &lt;?php echo get_avatar( $comment, 40 ); ?&gt;
</span><del>-                        &lt;?php printf( __('&lt;cite class=&quot;fn&quot;&gt;%s&lt;/cite&gt; &lt;span class=&quot;says&quot;&gt;says:&lt;/span&gt;'), get_comment_author_link() ); ?&gt;
</del><ins>+                        &lt;?php printf( __( '&lt;cite class=&quot;fn&quot;&gt;%s&lt;/cite&gt; &lt;span class=&quot;says&quot;&gt;says:&lt;/span&gt;' ), get_comment_author_link() ); ?&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;?php if ( $comment-&gt;comment_approved == '0' ) : ?&gt;
</span><span class="cx">                         &lt;em&gt;&lt;?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?&gt;&lt;/em&gt;
</span><span class="cx">                         &lt;br /&gt;
</span><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><del>-                &lt;div class=&quot;comment-meta commentmetadata&quot;&gt;&lt;a href=&quot;&lt;?php echo esc_url( get_comment_link( $comment-&gt;comment_ID ) ); ?&gt;&quot;&gt;&lt;?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()); ?&gt;&lt;/a&gt;&lt;?php edit_comment_link(__('(Edit)', 'twentyten'),'  ',''); ?&gt;&lt;/div&gt;
</del><ins>+                &lt;div class=&quot;comment-meta commentmetadata&quot;&gt;&lt;a href=&quot;&lt;?php echo esc_url( get_comment_link( $comment-&gt;comment_ID ) ); ?&gt;&quot;&gt;&lt;?php printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?&gt;&lt;/a&gt;&lt;?php edit_comment_link( __( '(Edit)', 'twentyten' ),'  ','' ); ?&gt;&lt;/div&gt;
</ins><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;comment-body&quot;&gt;&lt;?php comment_text(); ?&gt;&lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;reply&quot;&gt;
</span><del>-                        &lt;?php comment_reply_link( array_merge( $args, array('depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'])) ); ?&gt;
</del><ins>+                        &lt;?php comment_reply_link( array_merge( $args, array( 'depth' =&gt; $depth, 'max_depth' =&gt; $args['max_depth'] ) ) ); ?&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx">         &lt;/div&gt;
</span><span class="cx"> 
</span><del>-        &lt;?php } else { ?&gt;
</del><ins>+        &lt;?php else : ?&gt;
</ins><span class="cx">         &lt;li class=&quot;post pingback&quot;&gt;
</span><span class="cx">                 &lt;p&gt;&lt;?php _e( 'Pingback: ', 'twentyten' ); ?&gt;&lt;?php comment_author_link(); ?&gt;&lt;?php edit_comment_link ( __('edit', 'twentyten'), '&amp;nbsp;&amp;nbsp;', '' ); ?&gt;&lt;/p&gt;
</span><del>-        &lt;?php }
</del><ins>+        &lt;?php endif;
</ins><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx"> 
</span><span class="cx"> // Make the Visual Editor styles match the theme's styles
</span><del>-function twentyten_my_editor_style( $url ) {
-        if ( !empty($url) )
</del><ins>+if ( ! function_exists( 'twentyten_editor_style' ) ) :
+function twentyten_editor_style( $url ) {
+        if ( ! empty( $url ) )
</ins><span class="cx">                 $url .= ',';
</span><span class="cx"> 
</span><span class="cx">         // Change the path here if using sub-directory
</span><span class="lines">@@ -109,21 +133,30 @@
</span><span class="cx"> 
</span><span class="cx">         return $url;
</span><span class="cx"> }
</span><del>-add_filter( 'mce_css', 'twentyten_my_editor_style' );
</del><ins>+endif;
+add_filter( 'mce_css', 'twentyten_editor_style' );
</ins><span class="cx"> 
</span><del>-
</del><span class="cx"> // Remove inline styles on gallery shortcode
</span><ins>+if ( ! function_exists( 'twentyten_remove_gallery_css' ) ) :
</ins><span class="cx"> function twentyten_remove_gallery_css() {
</span><del>-        return &quot;&lt;div class='gallery'&gt;&quot;;
</del><ins>+        return &quot;\t\t&lt;div class='gallery'&gt;\n\t\t&quot;;
</ins><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx"> add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
</span><span class="cx"> 
</span><ins>+if ( ! function_exists( 'twentyten_cat_list' ) ) :
</ins><span class="cx"> function twentyten_cat_list() {
</span><span class="cx">         return twentyten_term_list('category', ', ', __('Posted in %s', 'twentyten'), __('Also posted in %s', 'twentyten') );
</span><span class="cx"> }
</span><ins>+endif;
+
+if ( ! function_exists( 'twentyten_tag_list' ) ) :
</ins><span class="cx"> function twentyten_tag_list() {
</span><span class="cx">         return twentyten_term_list('post_tag', ', ', __('Tagged %s', 'twentyten'), __('Also tagged %s', 'twentyten') );
</span><span class="cx"> }
</span><ins>+endif;
+
+if ( ! function_exists( 'twentyten_term_list' ) ) :
</ins><span class="cx"> function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '') {
</span><span class="cx">         global $wp_query, $post;
</span><span class="cx">         $current_term = $wp_query-&gt;get_queried_object();
</span><span class="lines">@@ -149,11 +182,13 @@
</span><span class="cx">                 return sprintf($text, join($glue, $tlist));
</span><span class="cx">         return '';
</span><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx"> 
</span><span class="cx"> // Register widgetized areas
</span><ins>+if ( ! function_exists( 'twentyten_widgets_init' ) ) :
</ins><span class="cx"> function twentyten_widgets_init() {
</span><span class="cx">         // Area 1
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'Primary Widget Area',
</span><span class="cx">                 'id' =&gt; 'primary-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The primary widget area' , 'twentyten' ),
</span><span class="lines">@@ -164,7 +199,7 @@
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Area 2
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'Secondary Widget Area',
</span><span class="cx">                 'id' =&gt; 'secondary-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The secondary widget area' , 'twentyten' ),
</span><span class="lines">@@ -175,7 +210,7 @@
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Area 3
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'First Footer Widget Area',
</span><span class="cx">                 'id' =&gt; 'first-footer-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The first footer widget area' , 'twentyten' ),
</span><span class="lines">@@ -186,7 +221,7 @@
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Area 4
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'Second Footer Widget Area',
</span><span class="cx">                 'id' =&gt; 'second-footer-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The second footer widget area' , 'twentyten' ),
</span><span class="lines">@@ -197,7 +232,7 @@
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Area 5
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'Third Footer Widget Area',
</span><span class="cx">                 'id' =&gt; 'third-footer-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The third footer widget area' , 'twentyten' ),
</span><span class="lines">@@ -208,7 +243,7 @@
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Area 6
</span><del>-        register_sidebar( array(
</del><ins>+        register_sidebar( array (
</ins><span class="cx">                 'name' =&gt; 'Fourth Footer Widget Area',
</span><span class="cx">                 'id' =&gt; 'fourth-footer-widget-area',
</span><span class="cx">                 'description' =&gt; __( 'The fourth footer widget area' , 'twentyten' ),
</span><span class="lines">@@ -218,7 +253,6 @@
</span><span class="cx">                 'after_title' =&gt; '&lt;/h3&gt;',
</span><span class="cx">         ) );
</span><span class="cx"> 
</span><del>-} // end theme_widgets_init
-
-// Add all the groovy widget areas
</del><ins>+}
+endif;
</ins><span class="cx"> add_action( 'init', 'twentyten_widgets_init' );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13156 => 13157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php        2010-02-14 21:27:55 UTC (rev 13156)
+++ trunk/wp-content/themes/twentyten/header.php        2010-02-14 21:39:20 UTC (rev 13157)
</span><span class="lines">@@ -5,15 +5,15 @@
</span><span class="cx">         if ( is_single() ) {
</span><span class="cx">                         single_post_title(); echo ' | '; bloginfo('name');
</span><span class="cx">                 } elseif ( is_home() || is_front_page() ) {
</span><del>-                        bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_get_page_number();
</del><ins>+                        bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();
</ins><span class="cx">                 } elseif ( is_page() ) {
</span><span class="cx">                         single_post_title(''); echo ' | '; bloginfo('name');
</span><span class="cx">                 } elseif ( is_search() ) {
</span><del>-                        printf(__('Search results for &quot;%s&quot;', 'twentyten'), esc_html($s)); twentyten_get_page_number(); echo ' | '; bloginfo('name'); 
</del><ins>+                        printf(__('Search results for &quot;%s&quot;', 'twentyten'), esc_html($s)); twentyten_the_page_number(); echo ' | '; bloginfo('name'); 
</ins><span class="cx">                 } elseif ( is_404() ) {
</span><span class="cx">                         _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
</span><span class="cx">                 } else {
</span><del>-                        wp_title(''); echo ' | '; bloginfo('name'); twentyten_get_page_number();
</del><ins>+                        wp_title(''); echo ' | '; bloginfo('name'); twentyten_the_page_number();
</ins><span class="cx">                 }
</span><span class="cx">     ?&gt;&lt;/title&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -24,7 +24,9 @@
</span><span class="cx">         &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; media=&quot;print&quot; href=&quot;&lt;?php bloginfo('stylesheet_directory'); ?&gt;/print.css&quot; /&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?&gt;
</span><ins>+
</ins><span class="cx">         &lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo( 'pingback_url' ); ?&gt;&quot; /&gt;
</span><ins>+
</ins><span class="cx">         &lt;?php wp_head(); ?&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>