Index: wp-content/themes/twentyten/searchform.php =================================================================== --- wp-content/themes/twentyten/searchform.php (revision 13111) +++ wp-content/themes/twentyten/searchform.php (working copy) @@ -1,7 +1,7 @@
- + - +
\ No newline at end of file Index: wp-content/themes/twentyten/footer.php =================================================================== --- wp-content/themes/twentyten/footer.php (revision 13111) +++ wp-content/themes/twentyten/footer.php (working copy) @@ -3,10 +3,10 @@ max_num_pages; if ( $total_pages > 1 ) { ?>
-

+

- +
Index: wp-content/themes/twentyten/sidebar-footer.php =================================================================== --- wp-content/themes/twentyten/sidebar-footer.php (revision 13111) +++ wp-content/themes/twentyten/sidebar-footer.php (working copy) @@ -1,11 +1,14 @@ @@ -54,18 +52,17 @@
>
-→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
- - - - - | - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + + + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
@@ -77,26 +74,26 @@
- - +the_permalink(); ?>" title="" rel="bookmark"> + +
-→', 'twentyten' ) ); ?> -' . __( 'Pages:', 'twentyten' ) . '&after=
') ?> + →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after='); ?>
- - | - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
- + @@ -104,14 +101,14 @@

- +
max_num_pages; if ( $total_pages > 1 ) { ?> @@ -119,4 +116,4 @@ - + \ No newline at end of file Index: wp-content/themes/twentyten/404.php =================================================================== --- wp-content/themes/twentyten/404.php (revision 13111) +++ wp-content/themes/twentyten/404.php (working copy) @@ -4,9 +4,9 @@
-

Not Found

+

-

Apologies, but the page you requested could not be found. Perhaps searching will help.

+

Index: wp-content/themes/twentyten/functions.php =================================================================== --- wp-content/themes/twentyten/functions.php (revision 13111) +++ wp-content/themes/twentyten/functions.php (working copy) @@ -1,7 +1,7 @@ ' . 'Continue reading →' . ''; } -add_filter('excerpt_more', 'new_excerpt_more'); +add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' ); // Template for comments and pingbacks -function twentyten_comment($comment, $args, $depth) { - $GLOBALS ['comment'] = $comment; ?> - comment_type) { ?> -
  • id="li-comment-"> +function twentyten_list_comment( $comment, $args, $depth ) { + $GLOBALS['comment'] = $comment; ?> + comment_type ) { ?> +
  • id="li-comment-">
    - - - %s says:'), get_comment_author_link()) ?> + + %s says:'), get_comment_author_link() ); ?>
    - comment_approved == '0') : ?> - + comment_approved == '0' ) : ?> +
    -
    +
    -
    +
    - $depth, 'max_depth' => $args['max_depth']))) ?> + $depth, 'max_depth' => $args['max_depth'])) ); ?>
  • -

    +

    "; } -add_filter('gallery_style', 'remove_gallery_css'); +add_filter( 'gallery_style', 'twentyten_remove_gallery_css' ); - // For category lists on category archives: Returns other categories except the current one (redundant) -function cats_meow($glue) { +function cats_meow( $glue ) { $current_cat = single_cat_title( '', false ); $separator = "\n"; $cats = explode( $separator, get_the_category_list($separator) ); foreach ( $cats as $i => $str ) { if ( strstr( $str, ">$current_cat<" ) ) { - unset($cats[$i]); + unset( $cats[$i] ); break; } } if ( empty($cats) ) return false; - return trim(join( $glue, $cats )); + return trim( join( $glue, $cats ) ); } // end cats_meow - // For tag lists on tag archives: Returns other tags except the current one (redundant) -function tag_ur_it($glue) { +function tag_ur_it( $glue ) { $current_tag = single_tag_title( '', '', false ); $separator = "\n"; $tags = explode( $separator, get_the_tag_list( "", "$separator", "" ) ); foreach ( $tags as $i => $str ) { if ( strstr( $str, ">$current_tag<" ) ) { - unset($tags[$i]); + unset( $tags[$i] ); break; } } if ( empty($tags) ) return false; - return trim(join( $glue, $tags )); + return trim( join( $glue, $tags ) ); } // end tag_ur_it // Register widgetized areas -function theme_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'), + 'description' => __( 'The primary widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -180,10 +172,10 @@ ) ); // Area 2 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Secondary Widget Area', 'id' => 'secondary-widget-area', - 'description' => __('The secondary widget area' , 'twentyten'), + 'description' => __( 'The secondary widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -191,10 +183,10 @@ ) ); // 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'), + 'description' => __( 'The first footer widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -202,10 +194,10 @@ ) ); // 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'), + 'description' => __( 'The second footer widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -213,10 +205,10 @@ ) ); // 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'), + 'description' => __( 'The third footer widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -224,10 +216,10 @@ ) ); // 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'), + 'description' => __( 'The fourth footer widget area' , 'twentyten' ), 'before_widget' => '
  • ', 'after_widget' => "
    • ", 'before_title' => '

    ', @@ -236,7 +228,5 @@ } // end theme_widgets_init - - // Add all the groovy widget areas -add_action( 'init', 'theme_widgets_init' ); +add_action( 'init', 'twentyten_widgets_init' ); \ No newline at end of file Index: wp-content/themes/twentyten/sidebar.php =================================================================== --- wp-content/themes/twentyten/sidebar.php (revision 13111) +++ wp-content/themes/twentyten/sidebar.php (working copy) @@ -6,30 +6,28 @@
  • -

    +

      - +
  • -

    +

      - - -
      • - - + +
      • +
    • - +

    \ No newline at end of file Index: wp-content/themes/twentyten/tag.php =================================================================== --- wp-content/themes/twentyten/tag.php (revision 13111) +++ wp-content/themes/twentyten/tag.php (working copy) @@ -5,14 +5,14 @@ -

    +

    max_num_pages; if ( $total_pages > 1 ) { ?> @@ -22,24 +22,24 @@

    - - - - + + + +
    -→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
    - - | + + - + - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
    @@ -47,8 +47,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> Index: wp-content/themes/twentyten/page.php =================================================================== --- wp-content/themes/twentyten/page.php (revision 13111) +++ wp-content/themes/twentyten/page.php (working copy) @@ -8,13 +8,13 @@
    >

    - -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> -', '' ) ?> + + ' . __( 'Pages:', 'twentyten' ) . '&after=
    '); ?> + ', '' ); ?> - + Index: wp-content/themes/twentyten/category.php =================================================================== --- wp-content/themes/twentyten/category.php (revision 13111) +++ wp-content/themes/twentyten/category.php (working copy) @@ -1,4 +1,3 @@ -
    @@ -6,15 +5,15 @@ -

    +

    ' . $categorydesc . '
    ' ); ?> max_num_pages; if ( $total_pages > 1 ) { ?> @@ -24,25 +23,24 @@

    - - - - + + + +
    -→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
    - - - | + + + - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
    @@ -50,8 +48,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> Index: wp-content/themes/twentyten/archive.php =================================================================== --- wp-content/themes/twentyten/archive.php (revision 13111) +++ wp-content/themes/twentyten/archive.php (working copy) @@ -6,21 +6,21 @@ -

    %s', 'twentyten' ), get_the_date() ) ?>

    +

    %s', 'twentyten' ), get_the_date() ); ?>

    -

    %s', 'twentyten' ), get_the_date('F Y') ) ?>

    +

    %s', 'twentyten' ), get_the_date('F Y') ); ?>

    -

    %s', 'twentyten' ), get_the_date('Y') ) ?>

    +

    %s', 'twentyten' ), get_the_date('Y') ); ?>

    -

    +

    max_num_pages; if ( $total_pages > 1 ) { ?> @@ -31,10 +31,9 @@
    - - - + + +
    @@ -43,10 +42,10 @@
    - | - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
    @@ -54,8 +53,8 @@ max_num_pages; if ( $total_pages > 1 ) { ?> Index: wp-content/themes/twentyten/single.php =================================================================== --- wp-content/themes/twentyten/single.php (revision 13111) +++ wp-content/themes/twentyten/single.php (working copy) @@ -6,37 +6,36 @@
    >

    - - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
    - -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> + + ' . __( 'Pages:', 'twentyten' ) . '&after=
    ' ); ?>
    - +
    -

    - +

    +
    @@ -48,18 +47,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() ); ?> -", "" ) ?> +", "" ); ?> - + Index: wp-content/themes/twentyten/comments.php =================================================================== --- wp-content/themes/twentyten/comments.php (revision 13111) +++ wp-content/themes/twentyten/comments.php (working copy) @@ -1,12 +1,12 @@
    -
    +
    1 ) : // are there comments to navigate through ?>
    -
    -
    +
    +
      - 'twentyten_comment') ); ?> + 'twentyten_comment') ); ?>
    1 ) : // are there comments to navigate through ?>
    -
    -
    +
    +
    Index: wp-content/themes/twentyten/header.php =================================================================== --- wp-content/themes/twentyten/header.php (revision 13111) +++ wp-content/themes/twentyten/header.php (working copy) @@ -3,11 +3,11 @@ <?php if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); } - elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); } + elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); twentyten_get_page_number(); } elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); } - elseif ( is_search() ) { print 'Search results for ' . esc_html($s); get_page_number(); print ' | '; bloginfo('name'); } + elseif ( is_search() ) { print 'Search results for ' . esc_html($s); twentyten_get_page_number(); print ' | '; bloginfo('name'); } elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); } - else { bloginfo('name'); wp_title('|'); get_page_number(); } + else { bloginfo('name'); wp_title('|'); twentyten_get_page_number(); } ?> @@ -20,9 +20,9 @@ - - - + + + > @@ -32,8 +32,8 @@
    -
    -
    +
    +
    - +
    Index: wp-content/themes/twentyten/attachment.php =================================================================== --- wp-content/themes/twentyten/attachment.php (revision 13111) +++ wp-content/themes/twentyten/attachment.php (working copy) @@ -5,18 +5,18 @@ -

    ← post_parent) ?>

    +

    ← post_parent); ?>

    >

    - + - | - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
    @@ -32,13 +32,13 @@
    - +
    -
    post_excerpt) ) the_excerpt() ?>
    +
    post_excerpt) ) the_excerpt(); ?>
    -→', 'twentyten' ) ); ?> -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> + →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=
    ' ); ?> @@ -48,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() ); ?> - Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> + Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> - Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> + Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> - post a comment.', 'twentyten' ) ?> + post a comment.', 'twentyten' ); ?> - + -", "" ) ?> +", "" ); ?>