Index: wp-content/themes/twentyten/functions.php
===================================================================
--- wp-content/themes/twentyten/functions.php	(revision 13154)
+++ wp-content/themes/twentyten/functions.php	(working copy)
@@ -1,16 +1,47 @@
 <?php
 
 // Set the content width based on the Theme CSS
-$content_width = apply_filters( 'twentyten_content_width', 640 );
+if ( ! isset( $content_width ) )
+   $content_width = 640;
 
-// 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 );
+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 );
 
+	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 . "/languages/$locale.php";
+	if ( is_readable( $locale_file ) )
+		require_once( $locale_file );
+}
+endif;
+add_action( 'init', 'twentyten_init' );
+
+if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 function twentyten_admin_header_style() {
 ?>
 <style type="text/css">
@@ -24,84 +55,78 @@
 </style>
 <?php
 }
+endif;
 
-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 . "/languages/$locale.php";
-if ( is_readable($locale_file) )
-	require_once( $locale_file );
-
 // Get the page number
-function twentyten_get_page_number() {
+if ( ! function_exists( 'get_page_number' ) ) :
+function get_page_number() {
 	if ( get_query_var('paged') )
-		echo ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');
+		return ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
 }
+endif;
 
+// Echo the page number
+if ( ! function_exists( 'the_page_number' ) ) :
+function the_page_number() {
+	echo get_page_number();
+}
+endif;
+
 // Control excerpt length
-function twentyten_new_excerpt_length( $length ) {
+if ( ! function_exists( 'twentyten_excerpt_length' ) ) :
+function twentyten_excerpt_length( $length ) {
 	return 40;
 }
-add_filter( 'excerpt_length', 'twentyten_new_excerpt_length' );
+endif;
+add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
 
 
 // Make a nice read more link on excerpts
-function twentyten_new_excerpt_more($more) {
+if ( ! function_exists( 'twentyten_excerpt_more' ) ) :
+function twentyten_excerpt_more($more) {
 	return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
 }
-add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' );
+endif;
+add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
 
 
 // Template for comments and pingbacks
-function twentyten_list_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment; ?>
-	<?php if ( '' == $comment->comment_type ) { ?>
+if ( ! function_exists( 'twentyten_comment' ) ) :
+function twentyten_comment( $comment, $args, $depth ) {
+	$GLOBALS ['comment'] = $comment; ?>
+	<?php if ( '' == $comment->comment_type ) : ?>
 	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<div id="comment-<?php comment_ID(); ?>">
 		<div class="comment-author vcard">
 			<?php echo get_avatar( $comment, 40 ); ?>
-			<?php printf( __('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link() ); ?>
+
+			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
 		</div>
 		<?php if ( $comment->comment_approved == '0' ) : ?>
-			<em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
+			<em><?php _e( 'Your comment is awaiting moderation.' ); ?></em>
 			<br />
 		<?php endif; ?>
 
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()); ?></a><?php edit_comment_link(__('(Edit)', 'twentyten'),'  ',''); ?></div>
+		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ) ?></a><?php edit_comment_link( __( '(Edit)' ),'  ','' ); ?></div>
 
 		<div class="comment-body"><?php comment_text(); ?></div>
 
 		<div class="reply">
-			<?php comment_reply_link( array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth'])) ); ?>
+			<?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
 		</div>
 	</div>
 
-	<?php } else { ?>
+	<?php else : ?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
-	<?php }
+		<p><?php _e( 'Pingback:' ); ?> <?php comment_author_link (); ?><?php edit_comment_link( 'edit', '&nbsp;&nbsp;', '' ); ?></p>
+	<?php endif;
 }
+endif;
 
 // Make the Visual Editor styles match the theme's styles
-function twentyten_my_editor_style( $url ) {
-	if ( !empty($url) )
+if ( ! function_exists( 'twentyten_editor_style' ) ) :
+function twentyten_editor_style( $url ) {
+	if ( ! empty( $url ) )
 		$url .= ',';
 
 	// Change the path here if using sub-directory
@@ -109,21 +134,30 @@
 
 	return $url;
 }
-add_filter( 'mce_css', 'twentyten_my_editor_style' );
+endif;
+add_filter( 'mce_css', 'twentyten_editor_style' );
 
-
 // Remove inline styles on gallery shortcode
+if ( ! function_exists( 'twentyten_remove_gallery_css' ) ) :
 function twentyten_remove_gallery_css() {
-	return "<div class='gallery'>";
+	return "\t\t<div class='gallery'>\n\t\t";
 }
+endif;
 add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
 
+if ( ! function_exists( 'twentyten_cat_list' ) ) :
 function twentyten_cat_list() {
 	return twentyten_term_list('category', ', ', __('Posted in %s', 'twentyten'), __('Also posted in %s', 'twentyten') );
 }
+endif;
+
+if ( ! function_exists( 'twentyten_tag_list' ) ) :
 function twentyten_tag_list() {
 	return twentyten_term_list('post_tag', ', ', __('Tagged %s', 'twentyten'), __('Also tagged %s', 'twentyten') );
 }
+endif;
+
+if ( ! function_exists( 'twentyten_term_list' ) ) :
 function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '') {
 	global $wp_query, $post;
 	$current_term = $wp_query->get_queried_object();
@@ -149,11 +183,13 @@
 		return sprintf($text, join($glue, $tlist));
 	return '';
 }
+endif;
 
 // Register widgetized areas
+if ( ! function_exists( 'twentyten_widgets_init' ) ) :
 function twentyten_widgets_init() {
 	// Area 1
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'Primary Widget Area',
 		'id' => 'primary-widget-area',
 		'description' => __( 'The primary widget area' , 'twentyten' ),
@@ -164,7 +200,7 @@
 	) );
 
 	// Area 2
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'Secondary Widget Area',
 		'id' => 'secondary-widget-area',
 		'description' => __( 'The secondary widget area' , 'twentyten' ),
@@ -175,7 +211,7 @@
 	) );
 
 	// Area 3
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'First Footer Widget Area',
 		'id' => 'first-footer-widget-area',
 		'description' => __( 'The first footer widget area' , 'twentyten' ),
@@ -186,7 +222,7 @@
 	) );
 
 	// Area 4
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'Second Footer Widget Area',
 		'id' => 'second-footer-widget-area',
 		'description' => __( 'The second footer widget area' , 'twentyten' ),
@@ -197,7 +233,7 @@
 	) );
 
 	// Area 5
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'Third Footer Widget Area',
 		'id' => 'third-footer-widget-area',
 		'description' => __( 'The third footer widget area' , 'twentyten' ),
@@ -208,7 +244,7 @@
 	) );
 
 	// Area 6
-	register_sidebar( array(
+	register_sidebar( array (
 		'name' => 'Fourth Footer Widget Area',
 		'id' => 'fourth-footer-widget-area',
 		'description' => __( 'The fourth footer widget area' , 'twentyten' ),
@@ -218,7 +254,6 @@
 		'after_title' => '</h3>',
 	) );
 
-} // end theme_widgets_init
-
-// Add all the groovy widget areas
+}
+endif;
 add_action( 'init', 'twentyten_widgets_init' );
Index: wp-content/themes/twentyten/header.php
===================================================================
--- wp-content/themes/twentyten/header.php	(revision 13154)
+++ wp-content/themes/twentyten/header.php	(working copy)
@@ -5,15 +5,15 @@
         if ( is_single() ) {
 			single_post_title(); echo ' | '; bloginfo('name');
 		} elseif ( is_home() || is_front_page() ) {
-			bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_get_page_number();
+			bloginfo('name'); echo ' | '; bloginfo('description'); the_page_number();
 		} elseif ( is_page() ) {
 			single_post_title(''); echo ' | '; bloginfo('name');
 		} elseif ( is_search() ) {
-			printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_get_page_number(); echo ' | '; bloginfo('name'); 
+			printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); the_page_number(); echo ' | '; bloginfo('name'); 
 		} elseif ( is_404() ) {
 			_e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
 		} else {
-			wp_title(''); echo ' | '; bloginfo('name'); twentyten_get_page_number();
+			wp_title(''); echo ' | '; bloginfo('name'); the_page_number();
 		}
     ?></title>
 
@@ -24,7 +24,9 @@
 	<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
 
 	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+
 	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+
 	<?php wp_head(); ?>
 </head>
 
@@ -35,19 +37,20 @@
 		<div id="masthead">
 
 			<div id="branding">
-				<div id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
-				<div id="site-description"><?php bloginfo( 'description' ); ?></div>
+				<div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
+				<div id="site-description"><?php bloginfo( 'description' ) ?></div>
 
 				<?php
-				if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
-					echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-				} else { ?>
+					global $post;
+					if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
+						echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+					} else { ?>
 					<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
 				<?php } ?>
 			</div><!-- #branding -->
 
 			<div id="access">
-				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
+				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ) ?>"><?php _e( 'Skip to content', 'twentyten' ) ?></a></div>
 				<?php wp_page_menu( 'sort_column=menu_order' ); ?>
 			</div><!-- #access -->
 
Index: wp-content/themes/twentyten/attachment.php
===================================================================
--- wp-content/themes/twentyten/attachment.php	(revision 13154)
+++ wp-content/themes/twentyten/attachment.php	(working copy)
@@ -5,7 +5,7 @@
 
 <?php the_post(); ?>
 
-				<p class="page-title"><a href="<?php echo get_permalink($post->post_parent); ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ); ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent); ?></a></p>
+				<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ) ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title( $post->post_parent ), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title( $post->post_parent ) ?></a></p>
 
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<h2 class="entry-title"><?php the_title(); ?></h2>
@@ -13,31 +13,32 @@
 					<div class="entry-meta">
 						<span class="meta-prep meta-prep-author"><?php _e( 'By ', 'twentyten' ); ?></span>
 						<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
-						<span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-						<span class="meta-prep meta-prep-entry-date"><?php _e( 'Published ', 'twentyten' ); ?></span>
-						<span class="entry-date"><abbr class="published" title="<?php the_time() ?>"><?php echo get_the_date(); ?></abbr></span>
-						<?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" ); ?>
+						<span class="meta-sep"> | </span>
+						<span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
+						<span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php echo get_the_date(); ?></abbr></span>
+						<?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" ) ?>
 					</div><!-- .entry-meta -->
 
 					<div class="entry-content">
 						<div class="entry-attachment">
-						<?php if ( wp_attachment_is_image() ) : ?>
-							<p class="attachment"><a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
-								echo wp_get_attachment_image( $post->ID, array($content_width, $content_width) ); // max $content_width wide or high.
-							?></a></p>
+<?php if ( wp_attachment_is_image( $post->ID ) ) : ?>
+						<p class="attachment"><a href="<?php echo wp_get_attachment_url( $post->ID ); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+							echo wp_get_attachment_image( $post->ID, array( $content_width, $content_width ) ); // max $content_width wide or high.
+						?></a></p>
 
-							<div id="nav-below" class="navigation">
-								<div class="nav-previous"><?php previous_image_link( false ); ?></div>
-								<div class="nav-next"><?php next_image_link( false ); ?></div>
-							</div><!-- #nav-below -->
-						<?php else : ?>
-							<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename(get_permalink()); ?></a>
-						<?php endif; ?>
+
+				<div id="nav-below" class="navigation">
+					<div class="nav-previous"><?php previous_image_link( false ); ?></div>
+					<div class="nav-next"><?php next_image_link( false ); ?></div>
+				</div><!-- #nav-below -->
+<?php else : ?>
+						<a href="<?php echo wp_get_attachment_url( $post->ID ) ?>" title="<?php echo esc_attr( get_the_title( $post->ID ) ); ?>" rel="attachment"><?php echo basename( get_permalink() ) ?></a>
+<?php endif; ?>
 						</div>
-						<div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); ?></div>
+						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt() ?></div>
 
-						<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
-						<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
+<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ) ?>
 
 					</div><!-- .entry-content -->
 
@@ -47,18 +48,18 @@
 						get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
 						get_permalink(),
 						the_title_attribute('echo=0'),
-						get_post_comments_feed_link() ); ?>
+						get_post_comments_feed_link() ) ?>
 
 <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
-						<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
+						<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
 <?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?>
-						<?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
+						<?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
 <?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?>
-						<?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
+						<?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ) ?>
 <?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>
-						<?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
+						<?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ) ?>
 <?php endif; ?>
-<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
+<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
 					</div><!-- .entry-utility -->
 				</div><!-- #post-<?php the_ID(); ?> -->
 
@@ -68,4 +69,4 @@
 		</div><!-- #container -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>