diff --git a/wp-content/themes/twentyten/404.php b/wp-content/themes/twentyten/404.php
index 6cc489cdb9564ee5d786bdf995bf58c28c65c145..914ef01089a6deece2842cfe99d66802a013c141 100644
--- a/wp-content/themes/twentyten/404.php
+++ b/wp-content/themes/twentyten/404.php
@@ -27,4 +27,4 @@ get_header(); ?>
document.getElementById('s') && document.getElementById('s').focus();
</script>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php
index 138b088ee8b7d1c303430977c29ac2292bd53908..5b8e6e1e94838bc6a92a8a48aea756070415c785 100644
--- a/wp-content/themes/twentyten/archive.php
+++ b/wp-content/themes/twentyten/archive.php
@@ -25,8 +25,9 @@ get_header(); ?>
* We reset this later so we can run the loop
* properly with a call to rewind_posts().
*/
- if ( have_posts() )
- the_post();
+if ( have_posts() ) {
+ the_post();
+}
?>
<h1 class="page-title">
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index 2b221b57f2095984b89207ea5a7f1533c32f4f23..b851764f119c80b841e8f3b311465af850bbd516 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -21,15 +21,17 @@ get_header(); ?>
* We reset this later so we can run the loop
* properly with a call to rewind_posts().
*/
- if ( have_posts() )
- the_post();
+if ( have_posts() ) {
+ the_post();
+}
?>
<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyten' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
<?php
// If a user has filled out their description, show a bio on their entries.
-if ( get_the_author_meta( 'description' ) ) : ?>
+if ( get_the_author_meta( 'description' ) ) :
+?>
<div id="entry-author-info">
<div id="author-avatar">
<?php
diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php
index 50ffbf3ec6fb2fe3bf8f2f08d3065cd7d5bc91e6..00714e85df2aaa2f7d322381221c2b8198d3ac66 100644
--- a/wp-content/themes/twentyten/category.php
+++ b/wp-content/themes/twentyten/category.php
@@ -12,13 +12,16 @@ get_header(); ?>
<div id="container">
<div id="content" role="main">
- <h1 class="page-title"><?php
+ <h1 class="page-title">
+ <?php
printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
- ?></h1>
+ ?>
+ </h1>
<?php
$category_description = category_description();
- if ( ! empty( $category_description ) )
- echo '<div class="archive-meta">' . $category_description . '</div>';
+ if ( ! empty( $category_description ) ) {
+ echo '<div class="archive-meta">' . $category_description . '</div>';
+ }
/*
* Run the loop for the category page to output the posts.
diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index 6825a510bab16137bd9bd48dd5849a350efc93f8..4b0943fb950cb82bf82e412a80eb7aa2dc2ea949 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -32,10 +32,14 @@
?>
<?php if ( have_comments() ) : ?>
- <h3 id="comments-title"><?php
- printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
- number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
- ?></h3>
+ <h3 id="comments-title">
+ <?php
+ printf(
+ _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
+ number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>'
+ );
+ ?>
+ </h3>
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
<div class="navigation">
@@ -69,9 +73,10 @@
* If there are no comments and comments are closed, let's leave a little note, shall we?
* But we only want the note on posts and pages that had comments in the first place.
*/
- if ( ! comments_open() && get_comments_number() ) : ?>
- <p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyten' ); ?></p>
- <?php endif; ?>
+ if ( ! comments_open() && get_comments_number() ) :
+ ?>
+ <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
+ <?php endif; ?>
<?php endif; // end have_comments() ?>
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index 4bc8c548f743d64bb7442aa75f8e20c84d78e023..4763e99abd33c6a12bca964a8101c71c670671b7 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -27,6 +27,11 @@
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<?php bloginfo( 'name' ); ?>
</a>
+ <?php
+ if ( function_exists( 'the_privacy_policy_link' ) ) {
+ the_privacy_policy_link( '<span role="separator" aria-hidden="true"></span>', '' );
+ }
+ ?>
</div><!-- #site-info -->
<div id="site-generator">
@@ -36,8 +41,11 @@
*
* @since Twenty Ten 1.0
*/
- do_action( 'twentyten_credits' ); ?>
- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
+ do_action( 'twentyten_credits' );
+ ?>
+ <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>">
+ <?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?>
+ </a>
</div><!-- #site-generator -->
</div><!-- #colophon -->
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 3db0ab0ed7f57f6f3cf691a95720fdec960d740e..0686cbee2b74434465d65b59a99a70c7e65eaeb4 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -44,195 +44,202 @@
* Used to set the width of images and content. Should be equal to the width the theme
* is designed for, generally via the style.css stylesheet.
*/
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
$content_width = 640;
+}
/* Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
add_action( 'after_setup_theme', 'twentyten_setup' );
-if ( ! function_exists( 'twentyten_setup' ) ):
-/**
- * Set up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which runs
- * before the init hook. The init hook is too late for some features, such as indicating
- * support post thumbnails.
- *
- * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
- * functions.php file.
- *
- * @uses add_theme_support() To add support for post thumbnails, custom headers and backgrounds, and automatic feed links.
- * @uses register_nav_menus() To add support for navigation menus.
- * @uses add_editor_style() To style the visual editor.
- * @uses load_theme_textdomain() For translation/localization support.
- * @uses register_default_headers() To register the default custom header images provided with the theme.
- * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_setup() {
-
- // This theme styles the visual editor with editor-style.css to match the theme style.
- add_editor_style();
-
- // Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
- add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
-
- // This theme uses post thumbnails
- add_theme_support( 'post-thumbnails' );
-
- // Add default posts and comments RSS feed links to head
- add_theme_support( 'automatic-feed-links' );
-
- /*
- * Make theme available for translation.
- * Translations can be filed in the /languages/ directory
+if ( ! function_exists( 'twentyten_setup' ) ) :
+ /**
+ * Set up theme defaults and registers support for various WordPress features.
+ *
+ * Note that this function is hooked into the after_setup_theme hook, which runs
+ * before the init hook. The init hook is too late for some features, such as indicating
+ * support post thumbnails.
+ *
+ * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
+ * functions.php file.
+ *
+ * @uses add_theme_support() To add support for post thumbnails, custom headers and backgrounds, and automatic feed links.
+ * @uses register_nav_menus() To add support for navigation menus.
+ * @uses add_editor_style() To style the visual editor.
+ * @uses load_theme_textdomain() For translation/localization support.
+ * @uses register_default_headers() To register the default custom header images provided with the theme.
+ * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
+ *
+ * @since Twenty Ten 1.0
*/
- load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+ function twentyten_setup() {
+
+ // This theme styles the visual editor with editor-style.css to match the theme style.
+ add_editor_style();
- // This theme uses wp_nav_menu() in one location.
- register_nav_menus( array(
- 'primary' => __( 'Primary Navigation', 'twentyten' ),
- ) );
+ // Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
+ add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
- // This theme allows users to set a custom background.
- add_theme_support( 'custom-background', array(
- // Let WordPress know what our default background color is.
- 'default-color' => 'f1f1f1',
- ) );
+ // This theme uses post thumbnails
+ add_theme_support( 'post-thumbnails' );
- // The custom header business starts here.
+ // Add default posts and comments RSS feed links to head
+ add_theme_support( 'automatic-feed-links' );
- $custom_header_support = array(
/*
- * The default image to use.
- * The %s is a placeholder for the theme template directory URI.
- */
- 'default-image' => '%s/images/headers/path.jpg',
- // The height and width of our custom header.
- /**
- * Filter the Twenty Ten default header image width.
- *
- * @since Twenty Ten 1.0
- *
- * @param int The default header image width in pixels. Default 940.
+ * Make theme available for translation.
+ * Translations can be filed in the /languages/ directory
*/
- 'width' => apply_filters( 'twentyten_header_image_width', 940 ),
- /**
- * Filter the Twenty Ten defaul header image height.
- *
- * @since Twenty Ten 1.0
- *
- * @param int The default header image height in pixels. Default 198.
- */
- 'height' => apply_filters( 'twentyten_header_image_height', 198 ),
- // Support flexible heights.
- 'flex-height' => true,
- // Don't support text inside the header image.
- 'header-text' => false,
- // Callback for styling the header preview in the admin.
- 'admin-head-callback' => 'twentyten_admin_header_style',
- );
+ load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+
+ // This theme uses wp_nav_menu() in one location.
+ register_nav_menus(
+ array(
+ 'primary' => __( 'Primary Navigation', 'twentyten' ),
+ )
+ );
+
+ // This theme allows users to set a custom background.
+ add_theme_support(
+ 'custom-background', array(
+ // Let WordPress know what our default background color is.
+ 'default-color' => 'f1f1f1',
+ )
+ );
+
+ // The custom header business starts here.
+
+ $custom_header_support = array(
+ /*
+ * The default image to use.
+ * The %s is a placeholder for the theme template directory URI.
+ */
+ 'default-image' => '%s/images/headers/path.jpg',
+ // The height and width of our custom header.
+ /**
+ * Filter the Twenty Ten default header image width.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param int The default header image width in pixels. Default 940.
+ */
+ 'width' => apply_filters( 'twentyten_header_image_width', 940 ),
+ /**
+ * Filter the Twenty Ten defaul header image height.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param int The default header image height in pixels. Default 198.
+ */
+ 'height' => apply_filters( 'twentyten_header_image_height', 198 ),
+ // Support flexible heights.
+ 'flex-height' => true,
+ // Don't support text inside the header image.
+ 'header-text' => false,
+ // Callback for styling the header preview in the admin.
+ 'admin-head-callback' => 'twentyten_admin_header_style',
+ );
+
+ add_theme_support( 'custom-header', $custom_header_support );
+
+ if ( ! function_exists( 'get_custom_header' ) ) {
+ // This is all for compatibility with versions of WordPress prior to 3.4.
+ define( 'HEADER_TEXTCOLOR', '' );
+ define( 'NO_HEADER_TEXT', true );
+ define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
+ define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
+ define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
+ add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
+ add_custom_background();
+ }
- add_theme_support( 'custom-header', $custom_header_support );
-
- if ( ! function_exists( 'get_custom_header' ) ) {
- // This is all for compatibility with versions of WordPress prior to 3.4.
- define( 'HEADER_TEXTCOLOR', '' );
- define( 'NO_HEADER_TEXT', true );
- define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
- define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
- define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
- add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
- add_custom_background();
+ /*
+ * We'll be using post thumbnails for custom header images on posts and pages.
+ * We want them to be 940 pixels wide by 198 pixels tall.
+ * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
+ */
+ set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+
+ // ... and thus ends the custom header business.
+
+ // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
+ register_default_headers(
+ array(
+ 'berries' => array(
+ 'url' => '%s/images/headers/berries.jpg',
+ 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Berries', 'twentyten' ),
+ ),
+ 'cherryblossom' => array(
+ 'url' => '%s/images/headers/cherryblossoms.jpg',
+ 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Cherry Blossoms', 'twentyten' ),
+ ),
+ 'concave' => array(
+ 'url' => '%s/images/headers/concave.jpg',
+ 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Concave', 'twentyten' ),
+ ),
+ 'fern' => array(
+ 'url' => '%s/images/headers/fern.jpg',
+ 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Fern', 'twentyten' ),
+ ),
+ 'forestfloor' => array(
+ 'url' => '%s/images/headers/forestfloor.jpg',
+ 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Forest Floor', 'twentyten' ),
+ ),
+ 'inkwell' => array(
+ 'url' => '%s/images/headers/inkwell.jpg',
+ 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Inkwell', 'twentyten' ),
+ ),
+ 'path' => array(
+ 'url' => '%s/images/headers/path.jpg',
+ 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Path', 'twentyten' ),
+ ),
+ 'sunset' => array(
+ 'url' => '%s/images/headers/sunset.jpg',
+ 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
+ /* translators: header image description */
+ 'description' => __( 'Sunset', 'twentyten' ),
+ ),
+ )
+ );
}
-
- /*
- * We'll be using post thumbnails for custom header images on posts and pages.
- * We want them to be 940 pixels wide by 198 pixels tall.
- * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
- */
- set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
-
- // ... and thus ends the custom header business.
-
- // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
- register_default_headers( array(
- 'berries' => array(
- 'url' => '%s/images/headers/berries.jpg',
- 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Berries', 'twentyten' )
- ),
- 'cherryblossom' => array(
- 'url' => '%s/images/headers/cherryblossoms.jpg',
- 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Cherry Blossoms', 'twentyten' )
- ),
- 'concave' => array(
- 'url' => '%s/images/headers/concave.jpg',
- 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Concave', 'twentyten' )
- ),
- 'fern' => array(
- 'url' => '%s/images/headers/fern.jpg',
- 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Fern', 'twentyten' )
- ),
- 'forestfloor' => array(
- 'url' => '%s/images/headers/forestfloor.jpg',
- 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Forest Floor', 'twentyten' )
- ),
- 'inkwell' => array(
- 'url' => '%s/images/headers/inkwell.jpg',
- 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Inkwell', 'twentyten' )
- ),
- 'path' => array(
- 'url' => '%s/images/headers/path.jpg',
- 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Path', 'twentyten' )
- ),
- 'sunset' => array(
- 'url' => '%s/images/headers/sunset.jpg',
- 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
- /* translators: header image description */
- 'description' => __( 'Sunset', 'twentyten' )
- )
- ) );
-}
endif;
if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
-/**
- * Style the header image displayed on the Appearance > Header admin panel.
- *
- * Referenced via add_custom_image_header() in twentyten_setup().
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_admin_header_style() {
-?>
-<style type="text/css" id="twentyten-admin-header-css">
-/* Shows the same border as on front end */
-#headimg {
+ /**
+ * Style the header image displayed on the Appearance > Header admin panel.
+ *
+ * Referenced via add_custom_image_header() in twentyten_setup().
+ *
+ * @since Twenty Ten 1.0
+ */
+ function twentyten_admin_header_style() {
+ ?>
+ <style type="text/css" id="twentyten-admin-header-css">
+ /* Shows the same border as on front end */
+ #headimg {
border-bottom: 1px solid #000;
border-top: 4px solid #000;
-}
-/* If header-text was supported, you would style the text with these selectors:
+ }
+ /* If header-text was supported, you would style the text with these selectors:
#headimg #name { }
#headimg #desc { }
-*/
-</style>
-<?php
-}
+ */
+ </style>
+ <?php
+ }
endif;
/**
@@ -246,8 +253,9 @@ endif;
* @param array $args An optional array of arguments. @see wp_page_menu()
*/
function twentyten_page_menu_args( $args ) {
- if ( ! isset( $args['show_home'] ) )
+ if ( ! isset( $args['show_home'] ) ) {
$args['show_home'] = true;
+ }
return $args;
}
add_filter( 'wp_page_menu_args', 'twentyten_page_menu_args' );
@@ -269,16 +277,16 @@ function twentyten_excerpt_length( $length ) {
add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
if ( ! function_exists( 'twentyten_continue_reading_link' ) ) :
-/**
- * Return a "Continue Reading" link for excerpts.
- *
- * @since Twenty Ten 1.0
- *
- * @return string "Continue Reading" link.
- */
-function twentyten_continue_reading_link() {
- return ' <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) . '</a>';
-}
+ /**
+ * Return a "Continue Reading" link for excerpts.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @return string "Continue Reading" link.
+ */
+ function twentyten_continue_reading_link() {
+ return ' <a href="' . get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) . '</a>';
+ }
endif;
/**
@@ -346,30 +354,31 @@ function twentyten_remove_gallery_css( $css ) {
return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
}
// Backwards compatibility with WordPress 3.0.
-if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
+if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) ) {
add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
+}
if ( ! function_exists( 'twentyten_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentyten_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Ten 1.0
- *
- * @param object $comment The comment object.
- * @param array $args An array of arguments. @see get_comment_reply_link()
- * @param int $depth The depth of the comment.
- */
-function twentyten_comment( $comment, $args, $depth ) {
- $GLOBALS['comment'] = $comment;
- switch ( $comment->comment_type ) :
- case '' :
- ?>
- <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+ /**
+ * Template for comments and pingbacks.
+ *
+ * To override this walker in a child theme without modifying the comments template
+ * simply create your own twentyten_comment(), and that function will be used instead.
+ *
+ * Used as a callback by wp_list_comments() for displaying the comments.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param object $comment The comment object.
+ * @param array $args An array of arguments. @see get_comment_reply_link()
+ * @param int $depth The depth of the comment.
+ */
+ function twentyten_comment( $comment, $args, $depth ) {
+ $GLOBALS['comment'] = $comment;
+ switch ( $comment->comment_type ) :
+ case '':
+ ?>
+ <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 ); ?>
@@ -383,28 +392,41 @@ function twentyten_comment( $comment, $args, $depth ) {
<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
<?php
/* translators: 1: date, 2: time */
- printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
+ printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() );
+ ?>
+ </a>
+ <?php
+ edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
?>
- </div><!-- .comment-meta .commentmetadata -->
+ </div><!-- .comment-meta .commentmetadata -->
- <div class="comment-body"><?php comment_text(); ?></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'] ) ) ); ?>
- </div><!-- .reply -->
- </div><!-- #comment-## -->
-
- <?php
- break;
- case 'pingback' :
- case 'trackback' :
- ?>
- <li class="post pingback">
+ <div class="reply">
+ <?php
+ comment_reply_link(
+ array_merge(
+ $args, array(
+ 'depth' => $depth,
+ 'max_depth' => $args['max_depth'],
+ )
+ )
+ );
+?>
+ </div><!-- .reply -->
+ </div><!-- #comment-## -->
+
+ <?php
+ break;
+ case 'pingback':
+ case 'trackback':
+ ?>
+ <li class="post pingback">
<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
<?php
- break;
- endswitch;
-}
+ break;
+ endswitch;
+ }
endif;
/**
@@ -419,70 +441,82 @@ endif;
*/
function twentyten_widgets_init() {
// Area 1, located at the top of the sidebar.
- register_sidebar( array(
- 'name' => __( 'Primary Widget Area', 'twentyten' ),
- 'id' => 'primary-widget-area',
- 'description' => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'Primary Widget Area', 'twentyten' ),
+ 'id' => 'primary-widget-area',
+ 'description' => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
// Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
- register_sidebar( array(
- 'name' => __( 'Secondary Widget Area', 'twentyten' ),
- 'id' => 'secondary-widget-area',
- 'description' => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'Secondary Widget Area', 'twentyten' ),
+ 'id' => 'secondary-widget-area',
+ 'description' => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
// Area 3, located in the footer. Empty by default.
- register_sidebar( array(
- 'name' => __( 'First Footer Widget Area', 'twentyten' ),
- 'id' => 'first-footer-widget-area',
- 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'First Footer Widget Area', 'twentyten' ),
+ 'id' => 'first-footer-widget-area',
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
// Area 4, located in the footer. Empty by default.
- register_sidebar( array(
- 'name' => __( 'Second Footer Widget Area', 'twentyten' ),
- 'id' => 'second-footer-widget-area',
- 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'Second Footer Widget Area', 'twentyten' ),
+ 'id' => 'second-footer-widget-area',
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
// Area 5, located in the footer. Empty by default.
- register_sidebar( array(
- 'name' => __( 'Third Footer Widget Area', 'twentyten' ),
- 'id' => 'third-footer-widget-area',
- 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'Third Footer Widget Area', 'twentyten' ),
+ 'id' => 'third-footer-widget-area',
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
// Area 6, located in the footer. Empty by default.
- register_sidebar( array(
- 'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
- 'id' => 'fourth-footer-widget-area',
- 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
- 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h3 class="widget-title">',
- 'after_title' => '</h3>',
- ) );
+ register_sidebar(
+ array(
+ 'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
+ 'id' => 'fourth-footer-widget-area',
+ 'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
+ 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h3 class="widget-title">',
+ 'after_title' => '</h3>',
+ )
+ );
}
/** Register sidebars by running twentyten_widgets_init() on the widgets_init hook. */
add_action( 'widgets_init', 'twentyten_widgets_init' );
@@ -505,53 +539,56 @@ function twentyten_remove_recent_comments_style() {
add_action( 'widgets_init', 'twentyten_remove_recent_comments_style' );
if ( ! function_exists( 'twentyten_posted_on' ) ) :
-/**
- * Print HTML with meta information for the current post-date/time and author.
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_posted_on() {
- printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
- 'meta-prep meta-prep-author',
- sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
- get_permalink(),
- esc_attr( get_the_time() ),
- get_the_date()
- ),
- sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
- get_author_posts_url( get_the_author_meta( 'ID' ) ),
- esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
- get_the_author()
- )
- );
-}
+ /**
+ * Print HTML with meta information for the current post-date/time and author.
+ *
+ * @since Twenty Ten 1.0
+ */
+ function twentyten_posted_on() {
+ printf(
+ __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
+ 'meta-prep meta-prep-author',
+ sprintf(
+ '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
+ get_permalink(),
+ esc_attr( get_the_time() ),
+ get_the_date()
+ ),
+ sprintf(
+ '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
+ esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
+ get_the_author()
+ )
+ );
+ }
endif;
if ( ! function_exists( 'twentyten_posted_in' ) ) :
-/**
- * Print HTML with meta information for the current post (category, tags and permalink).
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_posted_in() {
- // Retrieves tag list of current post, separated by commas.
- $tag_list = get_the_tag_list( '', ', ' );
- if ( $tag_list && ! is_wp_error( $tag_list ) ) {
- $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
- } elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
- $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
- } else {
- $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+ /**
+ * Print HTML with meta information for the current post (category, tags and permalink).
+ *
+ * @since Twenty Ten 1.0
+ */
+ function twentyten_posted_in() {
+ // Retrieves tag list of current post, separated by commas.
+ $tag_list = get_the_tag_list( '', ', ' );
+ if ( $tag_list && ! is_wp_error( $tag_list ) ) {
+ $posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+ } elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
+ $posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+ } else {
+ $posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+ }
+ // Prints the string, replacing the placeholders.
+ printf(
+ $posted_in,
+ get_the_category_list( ', ' ),
+ $tag_list,
+ get_permalink(),
+ the_title_attribute( 'echo=0' )
+ );
}
- // Prints the string, replacing the placeholders.
- printf(
- $posted_in,
- get_the_category_list( ', ' ),
- $tag_list,
- get_permalink(),
- the_title_attribute( 'echo=0' )
- );
-}
endif;
/**
@@ -569,26 +606,30 @@ function twentyten_get_gallery_images() {
if ( function_exists( 'get_post_galleries' ) ) {
$galleries = get_post_galleries( get_the_ID(), false );
- if ( isset( $galleries[0]['ids'] ) )
+ if ( isset( $galleries[0]['ids'] ) ) {
$images = explode( ',', $galleries[0]['ids'] );
+ }
} else {
$pattern = get_shortcode_regex();
preg_match( "/$pattern/s", get_the_content(), $match );
$atts = shortcode_parse_atts( $match[3] );
- if ( isset( $atts['ids'] ) )
+ if ( isset( $atts['ids'] ) ) {
$images = explode( ',', $atts['ids'] );
+ }
}
if ( ! $images ) {
- $images = get_posts( array(
- 'fields' => 'ids',
- 'numberposts' => 999,
- 'order' => 'ASC',
- 'orderby' => 'menu_order',
- 'post_mime_type' => 'image',
- 'post_parent' => get_the_ID(),
- 'post_type' => 'attachment',
- ) );
+ $images = get_posts(
+ array(
+ 'fields' => 'ids',
+ 'numberposts' => 999,
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order',
+ 'post_mime_type' => 'image',
+ 'post_parent' => get_the_ID(),
+ 'post_type' => 'attachment',
+ )
+ );
}
return $images;
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 1ff063b8f06af3901ca20a583502068435bbc604..6c2ee4c46b24605151651ba0f5609a0363810a8b 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -12,7 +12,8 @@
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
-<title><?php
+<title>
+<?php
/*
* Print the <title> tag based on what is being viewed.
*/
@@ -25,14 +26,17 @@
// Add the blog description for the home/front page.
$site_description = get_bloginfo( 'description', 'display' );
- if ( $site_description && ( is_home() || is_front_page() ) )
- echo " | $site_description";
+if ( $site_description && ( is_home() || is_front_page() ) ) {
+ echo " | $site_description";
+}
// Add a page number if necessary:
- if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
- echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+ echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+}
- ?></title>
+ ?>
+ </title>
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
@@ -41,8 +45,9 @@
* We add some JavaScript to pages with the comment form
* to support sites with threaded comments (when in use).
*/
- if ( is_singular() && get_option( 'thread_comments' ) )
- wp_enqueue_script( 'comment-reply' );
+if ( is_singular() && get_option( 'thread_comments' ) ) {
+ wp_enqueue_script( 'comment-reply' );
+}
/*
* Always have wp_head() just before the closing </head>
@@ -69,23 +74,23 @@
<?php
// Compatibility with versions of WordPress prior to 3.4.
- if ( function_exists( 'get_custom_header' ) ) {
- /*
- * We need to figure out what the minimum width should be for our featured image.
- * This result would be the suggested width if the theme were to implement flexible widths.
- */
- $header_image_width = get_theme_support( 'custom-header', 'width' );
- } else {
- $header_image_width = HEADER_IMAGE_WIDTH;
- }
+ if ( function_exists( 'get_custom_header' ) ) {
+ /*
+ * We need to figure out what the minimum width should be for our featured image.
+ * This result would be the suggested width if the theme were to implement flexible widths.
+ */
+ $header_image_width = get_theme_support( 'custom-header', 'width' );
+ } else {
+ $header_image_width = HEADER_IMAGE_WIDTH;
+ }
// Check if this is a post or page, if it has a thumbnail, and if it's a big one
- if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
+ if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
has_post_thumbnail( $post->ID ) &&
( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
$image[1] >= $header_image_width ) :
- // Houston, we have a new header image!
- echo get_the_post_thumbnail( $post->ID );
+ // Houston, we have a new header image!
+ echo get_the_post_thumbnail( $post->ID );
elseif ( get_header_image() ) :
// Compatibility with versions of WordPress prior to 3.4.
if ( function_exists( 'get_custom_header' ) ) {
@@ -101,10 +106,17 @@
</div><!-- #branding -->
<div id="access" role="navigation">
- <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
+ <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
<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 /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
- <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
+ <?php
+ wp_nav_menu(
+ array(
+ 'container_class' => 'menu-header',
+ 'theme_location' => 'primary',
+ )
+ );
+?>
</div><!-- #access -->
</div><!-- #masthead -->
</div><!-- #header -->
diff --git a/wp-content/themes/twentyten/languages/twentyten.pot b/wp-content/themes/twentyten/languages/twentyten.pot
index 98805d91dae9c2751bc0faa60c63eb0f09b75c35..52c6d611fd4ef38ad3b408e2828e759c0d8e8325 100644
--- a/wp-content/themes/twentyten/languages/twentyten.pot
+++ b/wp-content/themes/twentyten/languages/twentyten.pot
@@ -1,14 +1,14 @@
-# Copyright (C) 2017 the WordPress team
+# Copyright (C) 2018 the WordPress team
# This file is distributed under the GNU General Public License v2 or later.
msgid ""
msgstr ""
-"Project-Id-Version: Twenty Ten 2.4\n"
+"Project-Id-Version: Twenty Ten 2.5\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/twentyten\n"
-"POT-Creation-Date: 2017-11-01 20:17:06+00:00\n"
+"POT-Creation-Date: 2018-05-17 16:15:31+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,41 +20,41 @@ msgstr ""
msgid "Apologies, but the page you requested could not be found. Perhaps searching will help."
msgstr ""
-#: archive.php:34
+#: archive.php:35
msgid "Daily Archives: <span>%s</span>"
msgstr ""
-#: archive.php:36
+#: archive.php:37
msgid "Monthly Archives: <span>%s</span>"
msgstr ""
-#: archive.php:36
+#: archive.php:37
msgctxt "monthly archives date format"
msgid "F Y"
msgstr ""
-#: archive.php:38
+#: archive.php:39
msgid "Yearly Archives: <span>%s</span>"
msgstr ""
-#: archive.php:38
+#: archive.php:39
msgctxt "yearly archives date format"
msgid "Y"
msgstr ""
-#: archive.php:40
+#: archive.php:41
msgid "Blog Archives"
msgstr ""
-#: author.php:28
+#: author.php:29
msgid "Author Archives: %s"
msgstr ""
-#: author.php:47 loop-single.php:46
+#: author.php:49 loop-single.php:57
msgid "About %s"
msgstr ""
-#: category.php:16
+#: category.php:17
msgid "Category Archives: %s"
msgstr ""
@@ -62,232 +62,232 @@ msgstr ""
msgid "This post is password protected. Enter the password to view any comments."
msgstr ""
-#: comments.php:36
+#: comments.php:38
msgid "One Response to %2$s"
msgid_plural "%1$s Responses to %2$s"
msgstr[0] ""
msgstr[1] ""
-#: comments.php:42 comments.php:62
+#: comments.php:46 comments.php:66
msgid "<span class=\"meta-nav\">←</span> Older Comments"
msgstr ""
-#: comments.php:43 comments.php:63
+#: comments.php:47 comments.php:67
msgid "Newer Comments <span class=\"meta-nav\">→</span>"
msgstr ""
-#: comments.php:73
+#: comments.php:78
msgid "Comments are closed."
msgstr ""
-#: footer.php:40
+#: footer.php:46
msgid "https://wordpress.org/"
msgstr ""
-#: footer.php:40
+#: footer.php:46
msgid "Semantic Personal Publishing Platform"
msgstr ""
-#: footer.php:40
+#: footer.php:47
msgid "Proudly powered by %s."
msgstr ""
-#: functions.php:95
+#: functions.php:97
msgid "Primary Navigation"
msgstr ""
#. translators: header image description
-#: functions.php:165
+#: functions.php:171
msgid "Berries"
msgstr ""
#. translators: header image description
-#: functions.php:171
+#: functions.php:177
msgid "Cherry Blossoms"
msgstr ""
#. translators: header image description
-#: functions.php:177
+#: functions.php:183
msgid "Concave"
msgstr ""
#. translators: header image description
-#: functions.php:183
+#: functions.php:189
msgid "Fern"
msgstr ""
#. translators: header image description
-#: functions.php:189
+#: functions.php:195
msgid "Forest Floor"
msgstr ""
#. translators: header image description
-#: functions.php:195
+#: functions.php:201
msgid "Inkwell"
msgstr ""
#. translators: header image description
-#: functions.php:201
+#: functions.php:207
msgid "Path"
msgstr ""
#. translators: header image description
-#: functions.php:207
+#: functions.php:213
msgid "Sunset"
msgstr ""
-#: functions.php:280 loop-attachment.php:119 loop.php:116 loop.php:144
+#: functions.php:288 loop-attachment.php:151 loop.php:124 loop.php:152
msgid "Continue reading <span class=\"meta-nav\">→</span>"
msgstr ""
-#: functions.php:376
+#: functions.php:385
msgid "%s <span class=\"says\">says:</span>"
msgstr ""
-#: functions.php:379
+#: functions.php:388
msgid "Your comment is awaiting moderation."
msgstr ""
#. translators: 1: date, 2: time
-#: functions.php:386
+#: functions.php:395
msgid "%1$s at %2$s"
msgstr ""
-#: functions.php:386 functions.php:403
+#: functions.php:399 functions.php:425
msgid "(Edit)"
msgstr ""
-#: functions.php:403
+#: functions.php:425
msgid "Pingback:"
msgstr ""
-#: functions.php:423
+#: functions.php:446
msgid "Primary Widget Area"
msgstr ""
-#: functions.php:425
+#: functions.php:448
msgid "Add widgets here to appear in your sidebar."
msgstr ""
-#: functions.php:434
+#: functions.php:459
msgid "Secondary Widget Area"
msgstr ""
-#: functions.php:436
+#: functions.php:461
msgid "An optional secondary widget area, displays below the primary widget area in your sidebar."
msgstr ""
-#: functions.php:445
+#: functions.php:472
msgid "First Footer Widget Area"
msgstr ""
-#: functions.php:447 functions.php:458 functions.php:469 functions.php:480
+#: functions.php:474 functions.php:487 functions.php:500 functions.php:513
msgid "An optional widget area for your site footer."
msgstr ""
-#: functions.php:456
+#: functions.php:485
msgid "Second Footer Widget Area"
msgstr ""
-#: functions.php:467
+#: functions.php:498
msgid "Third Footer Widget Area"
msgstr ""
-#: functions.php:478
+#: functions.php:511
msgid "Fourth Footer Widget Area"
msgstr ""
-#: functions.php:514
+#: functions.php:549
msgid "<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</span> %3$s"
msgstr ""
-#: functions.php:523 loop-attachment.php:36
+#: functions.php:560 loop-attachment.php:44
msgid "View all posts by %s"
msgstr ""
-#: functions.php:540
+#: functions.php:577
msgid "This entry was posted in %1$s and tagged %2$s. Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
-#: functions.php:542
+#: functions.php:579
msgid "This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
-#: functions.php:544
+#: functions.php:581
msgid "Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
-#: header.php:33
+#: header.php:35
msgid "Page %s"
msgstr ""
-#: header.php:105
+#: header.php:110
msgid "Skip to content"
msgstr ""
-#: loop-attachment.php:21
+#: loop-attachment.php:25
msgid "Return to %s"
msgstr ""
#. translators: %s - title of parent post
-#: loop-attachment.php:23
+#: loop-attachment.php:28
msgid "<span class=\"meta-nav\">←</span> %s"
msgstr ""
-#: loop-attachment.php:32
+#: loop-attachment.php:39
msgid "<span class=\"%1$s\">By</span> %2$s"
msgstr ""
-#: loop-attachment.php:43
+#: loop-attachment.php:52
msgid "<span class=\"%1$s\">Published</span> %2$s"
msgstr ""
-#: loop-attachment.php:53
+#: loop-attachment.php:64
msgid "Full size is %s pixels"
msgstr ""
-#: loop-attachment.php:56
+#: loop-attachment.php:68
msgid "Link to full-size image"
msgstr ""
-#: loop-attachment.php:63 loop-attachment.php:126 loop-page.php:30
-#: loop-single.php:59 loop.php:101 loop.php:124 loop.php:166
+#: loop-attachment.php:75 loop-attachment.php:165 loop-page.php:41
+#: loop-single.php:70 loop.php:109 loop.php:132 loop.php:181
msgid "Edit"
msgstr ""
-#: loop-attachment.php:120 loop-page.php:29 loop-single.php:34 loop.php:145
+#: loop-attachment.php:155 loop-page.php:36 loop-single.php:41 loop.php:156
msgid "Pages:"
msgstr ""
-#: loop-single.php:21 loop-single.php:64
+#: loop-single.php:25 loop-single.php:75
msgctxt "Previous post link"
msgid "←"
msgstr ""
-#: loop-single.php:22 loop-single.php:65
+#: loop-single.php:26 loop-single.php:76
msgctxt "Next post link"
msgid "→"
msgstr ""
-#: loop-single.php:50
+#: loop-single.php:61
msgid "View all posts by %s <span class=\"meta-nav\">→</span>"
msgstr ""
-#: loop.php:25 loop.php:179
+#: loop.php:25 loop.php:194
msgid "<span class=\"meta-nav\">←</span> Older posts"
msgstr ""
-#: loop.php:26 loop.php:180
+#: loop.php:26 loop.php:195
msgid "Newer posts <span class=\"meta-nav\">→</span>"
msgstr ""
@@ -295,55 +295,55 @@ msgstr ""
msgid "Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post."
msgstr ""
-#: loop.php:62 loop.php:96
+#: loop.php:65 loop.php:104
msgctxt "gallery category slug"
msgid "gallery"
msgstr ""
-#: loop.php:83
+#: loop.php:89
msgid "This gallery contains <a %1$s>%2$s photo</a>."
msgid_plural "This gallery contains <a %1$s>%2$s photos</a>."
msgstr[0] ""
msgstr[1] ""
-#: loop.php:84
+#: loop.php:90
msgid "Permalink to %s"
msgstr ""
-#: loop.php:94
+#: loop.php:102
msgid "View Galleries"
msgstr ""
-#: loop.php:94 loop.php:97
+#: loop.php:102 loop.php:105
msgid "More Galleries"
msgstr ""
-#: loop.php:97
+#: loop.php:105
msgid "View posts in the Gallery category"
msgstr ""
-#: loop.php:100 loop.php:123 loop.php:165
+#: loop.php:108 loop.php:131 loop.php:180
msgid "Leave a comment"
msgstr ""
-#: loop.php:100 loop.php:123 loop.php:165
+#: loop.php:108 loop.php:131 loop.php:180
msgid "1 Comment"
msgstr ""
-#: loop.php:100 loop.php:123 loop.php:165
+#: loop.php:108 loop.php:131 loop.php:180
msgid "% Comments"
msgstr ""
-#: loop.php:107
+#: loop.php:115
msgctxt "asides category slug"
msgid "asides"
msgstr ""
-#: loop.php:152
+#: loop.php:167
msgid "<span class=\"%1$s\">Posted in</span> %2$s"
msgstr ""
-#: loop.php:161
+#: loop.php:176
msgid "<span class=\"%1$s\">Tagged</span> %2$s"
msgstr ""
@@ -359,15 +359,15 @@ msgstr ""
msgid "Sorry, but nothing matched your search criteria. Please try again with some different keywords."
msgstr ""
-#: sidebar.php:28
+#: sidebar.php:29
msgid "Archives"
msgstr ""
-#: sidebar.php:35
+#: sidebar.php:36
msgid "Meta"
msgstr ""
-#: tag.php:16
+#: tag.php:17
msgid "Tag Archives: %s"
msgstr ""
#. Theme Name of the plugin/theme
diff --git a/wp-content/themes/twentyten/loop-attachment.php b/wp-content/themes/twentyten/loop-attachment.php
index a2dfae6e241dd9e7819fec152dcd7a328d8e0e23..04da9f48d43a61a03d7ad1fb50755f3386949959 100644
--- a/wp-content/themes/twentyten/loop-attachment.php
+++ b/wp-content/themes/twentyten/loop-attachment.php
@@ -15,34 +15,44 @@
*/
?>
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+if ( have_posts() ) {
+ while ( have_posts() ) :
+ the_post();
+ ?>
<?php if ( ! empty( $post->post_parent ) ) : ?>
- <p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
- /* translators: %s - title of parent post */
- printf( __( '<span class="meta-nav">←</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
- ?></a></p>
+ <p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery">
+ <?php
+ /* translators: %s - title of parent post */
+ printf( __( '<span class="meta-nav">←</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
+ ?>
+ </a></p>
<?php endif; ?>
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<h2 class="entry-title"><?php the_title(); ?></h2>
<div class="entry-meta">
<?php
- printf( __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
+ printf(
+ __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
'meta-prep meta-prep-author',
- sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+ sprintf(
+ '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
get_author_posts_url( get_the_author_meta( 'ID' ) ),
esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
get_the_author()
)
);
- ?>
- <span class="meta-sep">|</span>
- <?php
- printf( __( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
+ ?>
+ <span class="meta-sep">|</span>
+ <?php
+ printf(
+ __( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
'meta-prep meta-prep-entry-date',
- sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+ sprintf(
+ '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
esc_attr( get_the_time() ),
get_the_date()
)
@@ -50,8 +60,10 @@
if ( wp_attachment_is_image() ) {
echo ' <span class="meta-sep">|</span> ';
$metadata = wp_get_attachment_metadata();
- printf( __( 'Full size is %s pixels', 'twentyten' ),
- sprintf( '<a href="%1$s" title="%2$s">%3$s × %4$s</a>',
+ printf(
+ __( 'Full size is %s pixels', 'twentyten' ),
+ sprintf(
+ '<a href="%1$s" title="%2$s">%3$s × %4$s</a>',
esc_url( wp_get_attachment_url() ),
esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
$metadata['width'],
@@ -59,65 +71,92 @@
)
);
}
- ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-meta -->
+ ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
- <div class="entry-content">
+ <div class="entry-content">
<div class="entry-attachment">
-<?php if ( wp_attachment_is_image() ) :
- $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
- foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID )
- break;
- }
+ <?php
+ if ( wp_attachment_is_image() ) :
+ $attachments = array_values(
+ get_children(
+ array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID',
+ )
+ )
+ );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID ) {
+ break;
+ }
+ }
- // If there is more than 1 image attachment in a gallery
- if ( count( $attachments ) > 1 ) {
- $k++;
- if ( isset( $attachments[ $k ] ) )
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- else
- // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[0]->ID );
- } else {
- // or, if there's only 1 image attachment, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
- }
-?>
- <p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
- /**
- * Filter the Twenty Ten default attachment width.
- *
- * @since Twenty Ten 1.0
- *
- * @param int The default attachment width in pixels. Default 900.
- */
- $attachment_width = apply_filters( 'twentyten_attachment_size', 900 );
- /**
- * Filter the Twenty Ten default attachment height.
- *
- * @since Twenty Ten 1.0
- *
- * @param int The default attachment height in pixels. Default 900.
- */
- $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
- echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
- ?></a></p>
+ // If there is more than 1 image attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ $k++;
+ if ( isset( $attachments[ $k ] ) ) {
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ } else { // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
+ }
+ } else {
+ // or, if there's only 1 image attachment, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
+ ?>
+ <p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
+ <?php
+ /**
+ * Filter the Twenty Ten default attachment width.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param int The default attachment width in pixels. Default 900.
+ */
+ $attachment_width = apply_filters( 'twentyten_attachment_size', 900 );
+ /**
+ * Filter the Twenty Ten default attachment height.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param int The default attachment height in pixels. Default 900.
+ */
+ $attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
+ echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
+ ?>
+ </a></p>
- <div id="nav-below" class="navigation">
+ <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 : ?>
+ <?php else : ?>
<a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( basename( get_permalink() ) ); ?></a>
-<?php endif; ?>
+ <?php endif; ?>
</div><!-- .entry-attachment -->
- <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">→</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+ 'after' => '</div>',
+ )
+ );
+ ?>
</div><!-- .entry-content -->
@@ -129,4 +168,5 @@
<?php comments_template(); ?>
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop-page.php b/wp-content/themes/twentyten/loop-page.php
index 989881f74a4e26c947cfd1dbdb616c32dfce6f95..f522cff95ffe5356ad474666f80b3c2613c25a1c 100644
--- a/wp-content/themes/twentyten/loop-page.php
+++ b/wp-content/themes/twentyten/loop-page.php
@@ -15,7 +15,11 @@
*/
?>
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+if ( have_posts() ) {
+ while ( have_posts() ) :
+ the_post();
+ ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?php if ( is_front_page() ) { ?>
@@ -26,11 +30,19 @@
<div class="entry-content">
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+ 'after' => '</div>',
+ )
+ );
+ ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-content -->
</div><!-- #post-## -->
<?php comments_template( '', true ); ?>
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop-single.php b/wp-content/themes/twentyten/loop-single.php
index 68dd08f6f8e5a17e61b546b44e40ac24254e155a..b9a791a6281f9e7a0158df0b687884fc890b8110 100644
--- a/wp-content/themes/twentyten/loop-single.php
+++ b/wp-content/themes/twentyten/loop-single.php
@@ -15,7 +15,11 @@
*/
?>
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+if ( have_posts() ) {
+ while ( have_posts() ) :
+ the_post();
+ ?>
<div id="nav-above" class="navigation">
<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
@@ -31,18 +35,25 @@
<div class="entry-content">
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+ 'after' => '</div>',
+ )
+ );
+ ?>
</div><!-- .entry-content -->
-<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
+ <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
<div id="entry-author-info">
<div id="author-avatar">
<?php
/** This filter is documented in author.php */
echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) );
?>
- </div><!-- #author-avatar -->
- <div id="author-description">
+ </div><!-- #author-avatar -->
+ <div id="author-description">
<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
<?php the_author_meta( 'description' ); ?>
<div id="author-link">
@@ -50,21 +61,22 @@
<?php printf( __( 'View all posts by %s <span class="meta-nav">→</span>', 'twentyten' ), get_the_author() ); ?>
</a>
</div><!-- #author-link -->
- </div><!-- #author-description -->
- </div><!-- #entry-author-info -->
-<?php endif; ?>
+ </div><!-- #author-description -->
+ </div><!-- #entry-author-info -->
+ <?php endif; ?>
- <div class="entry-utility">
- <?php twentyten_posted_in(); ?>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-utility -->
- </div><!-- #post-## -->
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
- <div id="nav-below" class="navigation">
- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
- </div><!-- #nav-below -->
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+ </div><!-- #nav-below -->
- <?php comments_template( '', true ); ?>
+ <?php comments_template( '', true ); ?>
-<?php endwhile; // end of the loop. ?>
+ <?php endwhile;
+}; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 9f3088544fa4ee230efad6852f9993d8f6fd0abb..220ba7b0eccf93548ba16e1e9d9ab788d392ff8a 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -55,7 +55,10 @@
* Without further ado, the loop:
*/
?>
-<?php while ( have_posts() ) : the_post(); ?>
+<?php
+while ( have_posts() ) :
+ the_post();
+?>
<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
@@ -73,17 +76,22 @@
<?php else : ?>
<?php
$images = twentyten_get_gallery_images();
- if ( $images ) :
- $total_images = count( $images );
- $image = reset( $images );
+ if ( $images ) :
+ $total_images = count( $images );
+ $image = reset( $images );
?>
- <div class="gallery-thumb">
- <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
- </div><!-- .gallery-thumb -->
- <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
- 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
- number_format_i18n( $total_images )
- ); ?></em></p>
+ <div class="gallery-thumb">
+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
+ </div><!-- .gallery-thumb -->
+ <p><em>
+ <?php
+ printf(
+ _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyten' ),
+ 'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
+ number_format_i18n( $total_images )
+ );
+ ?>
+ </em></p>
<?php endif; // end twentyten_get_gallery_images() check ?>
<?php the_excerpt(); ?>
<?php endif; ?>
@@ -104,7 +112,7 @@
<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
- <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
+ <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
@@ -142,7 +150,14 @@
<?php else : ?>
<div class="entry-content">
<?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyten' ) ); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php
+ wp_link_pages(
+ array(
+ 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+ 'after' => '</div>',
+ )
+ );
+?>
</div><!-- .entry-content -->
<?php endif; ?>
@@ -155,12 +170,12 @@
<?php endif; ?>
<?php
$tags_list = get_the_tag_list( '', ', ' );
- if ( $tags_list ):
+ if ( $tags_list ) :
?>
- <span class="tag-links">
- <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
- </span>
- <span class="meta-sep">|</span>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+ </span>
+ <span class="meta-sep">|</span>
<?php endif; ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
@@ -174,7 +189,7 @@
<?php endwhile; // End the loop. Whew. ?>
<?php /* Display navigation to next/previous pages when applicable */ ?>
-<?php if ( $wp_query->max_num_pages > 1 ) : ?>
+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
<div id="nav-below" class="navigation">
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentyten' ) ); ?></div>
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentyten' ) ); ?></div>
diff --git a/wp-content/themes/twentyten/readme.txt b/wp-content/themes/twentyten/readme.txt
index 804b52c9b5b4a9786eebfac3b2e9945090b57a7a..9dd33103f20a2c882e2d471846c424e714a96b69 100644
--- a/wp-content/themes/twentyten/readme.txt
+++ b/wp-content/themes/twentyten/readme.txt
@@ -2,7 +2,7 @@
Contributors: the WordPress team
Requires at least: WordPress 3.0
Tested up to: WordPress 5.0-trunk
-Stable tag: 2.4
+Stable tag: 2.5
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: blog, two-columns, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header, featured-images, footer-widgets, featured-image-header
@@ -22,7 +22,7 @@ For more information about Twenty Ten theme please go to https://codex.wordpress
== Copyright ==
-Twenty Ten WordPress Theme, Copyright 2010-2017 WordPress.org & Automattic.com
+Twenty Ten WordPress Theme, Copyright 2010-2018 WordPress.org & Automattic.com
Twenty Ten is Distributed under the terms of the GNU GPL
This program is free software: you can redistribute it and/or modify
@@ -37,6 +37,11 @@ GNU General Public License for more details.
== Changelog ==
+= 2.5 =
+* Released: May 17, 2018
+
+https://codex.wordpress.org/Twenty_Ten_Theme_Changelog#Version_2.5
+
= 2.4 =
* Released: November 14, 2017
diff --git a/wp-content/themes/twentyten/rtl.css b/wp-content/themes/twentyten/rtl.css
index c458a544e4c8bff6df304b916896e541a72f19f1..f74839921a9b881ebb318c5fa9b8fe570a283714 100644
--- a/wp-content/themes/twentyten/rtl.css
+++ b/wp-content/themes/twentyten/rtl.css
@@ -238,6 +238,9 @@ div.menu li{
.children #respond {
margin: 0 0 0 48px;
}
+#respond #wp-comment-cookies-consent {
+ margin: 0 0 0 10px;
+}
/* =Widget Areas
-------------------------------------------------------------- */
diff --git a/wp-content/themes/twentyten/sidebar-footer.php b/wp-content/themes/twentyten/sidebar-footer.php
index c055ad1cd8bd45a7457685ce0af4423bbd63f116..b4480ee51ae42e9540563ae3d57504ffdb746d82 100644
--- a/wp-content/themes/twentyten/sidebar-footer.php
+++ b/wp-content/themes/twentyten/sidebar-footer.php
@@ -15,12 +15,13 @@
*
* If none of the sidebars have widgets, then let's bail early.
*/
- if ( ! is_active_sidebar( 'first-footer-widget-area' )
+if ( ! is_active_sidebar( 'first-footer-widget-area' )
&& ! is_active_sidebar( 'second-footer-widget-area' )
- && ! is_active_sidebar( 'third-footer-widget-area' )
+ && ! is_active_sidebar( 'third-footer-widget-area' )
&& ! is_active_sidebar( 'fourth-footer-widget-area' )
- )
- return;
+ ) {
+ return;
+}
// If we get this far, we have widgets. Let do this.
?>
diff --git a/wp-content/themes/twentyten/sidebar.php b/wp-content/themes/twentyten/sidebar.php
index 75ec6a12b3c7958b76ea167781b980aa9e975d0e..40018d2f47d4a71a32cd62dc2004eafc60d7aec4 100644
--- a/wp-content/themes/twentyten/sidebar.php
+++ b/wp-content/themes/twentyten/sidebar.php
@@ -18,7 +18,8 @@
* then the sidebar simply doesn't exist, so we'll hard-code in
* some default sidebar stuff just in case.
*/
- if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
+if ( ! dynamic_sidebar( 'primary-widget-area' ) ) :
+ ?>
<li id="search" class="widget-container widget_search">
<?php get_search_form(); ?>
@@ -46,7 +47,8 @@
<?php
// A second sidebar for widgets, just because.
- if ( is_active_sidebar( 'secondary-widget-area' ) ) : ?>
+if ( is_active_sidebar( 'secondary-widget-area' ) ) :
+ ?>
<div id="secondary" class="widget-area" role="complementary">
<ul class="xoxo">
diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css
index d73dadd075d1f98173843d4faf692898c6f23629..37bd178e5f2025fdbbcc2df819dbe92b011443aa 100644
--- a/wp-content/themes/twentyten/style.css
+++ b/wp-content/themes/twentyten/style.css
@@ -4,7 +4,7 @@ Theme URI: https://wordpress.org/themes/twentyten/
Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
Author: the WordPress team
Author URI: https://wordpress.org/
-Version: 2.4
+Version: 2.5
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: blog, two-columns, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header, featured-images, footer-widgets, featured-image-header
@@ -1132,6 +1132,10 @@ h3#reply-title {
font-size: 14px;
width: auto;
}
+#respond #wp-comment-cookies-consent {
+ width: auto;
+ margin: 0 10px 0 0;
+}
/* =Widget Areas
@@ -1318,6 +1322,12 @@ img#wpstats {
display: block;
margin: 0 auto 10px;
}
+#site-info span[role=separator] {
+ padding: 0 0.6em 0 0.3em;
+}
+#site-info span[role=separator]::before {
+ content: '\007c';
+}
/* =Mobile Safari ( iPad, iPhone and iPod Touch )
diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php
index 01ae6cd36c340915273e38d5ec07c28b7f1b3a97..e6fed3014f3f0890ce6f1b1778f9e9d853d886db 100644
--- a/wp-content/themes/twentyten/tag.php
+++ b/wp-content/themes/twentyten/tag.php
@@ -12,9 +12,11 @@ get_header(); ?>
<div id="container">
<div id="content" role="main">
- <h1 class="page-title"><?php
+ <h1 class="page-title">
+ <?php
printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
- ?></h1>
+ ?>
+ </h1>
<?php
/*