diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index 4d9d5fc9db..3218369ee9 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -21,23 +21,23 @@
- ";
+ return "\t\t\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 +182,13 @@ function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '
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 +199,7 @@ function twentyten_widgets_init() {
) );
// Area 2
- register_sidebar( array(
+ register_sidebar( array (
'name' => 'Secondary Widget Area',
'id' => 'secondary-widget-area',
'description' => __( 'The secondary widget area' , 'twentyten' ),
@@ -175,7 +210,7 @@ function twentyten_widgets_init() {
) );
// 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 +221,7 @@ function twentyten_widgets_init() {
) );
// 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 +232,7 @@ function twentyten_widgets_init() {
) );
// 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 +243,7 @@ function twentyten_widgets_init() {
) );
// 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 +253,6 @@ function twentyten_widgets_init() {
'after_title' => '',
) );
-} // end theme_widgets_init
-
-// Add all the groovy widget areas
+}
+endif;
add_action( 'init', 'twentyten_widgets_init' );
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 366c91f54d..ceafaad6b0 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -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'); twentyten_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)); twentyten_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'); twentyten_the_page_number();
}
?>
@@ -24,7 +24,9 @@
+
+
-