Changes in trunk/wp-content/themes/twentyten/functions.php [14955:15222]

File:

• trunk/wp-content/themes/twentyten/functions.php (modified) (9 diffs)

trunk/wp-content/themes/twentyten/functions.php

@@ -62 +62 @@
  * functions.php file.
  *
- * @uses add_theme_support() To add support for post thumbnails, navigation menus, and automatic feed links.
+ * @uses add_theme_support() To add support for post thumbnails and automatic feed links.
+ * @uses register_nav_menus() To add support for navigation menus.
  * @uses add_custom_background() To add support for a custom background.
  * @uses add_editor_style() To style the visual editor.
@@ -191 +192 @@
 /* Shows the same border as on front end */
 #headimg {
-    border-bottom: 1px solid #000000;
-    border-top: 4px solid #000000;
-}
-
-/* If NO_HEADER_TEXT is false, you can style here the header text preview */
-#headimg #name {
-}
-
-#headimg #desc {
-}
+    border-bottom: 1px solid #000;
+    border-top: 4px solid #000;
+}
+/* If NO_HEADER_TEXT is false, you would style the text with these selectors:
+    #headimg #name { }
+    #headimg #desc { }
+*/
 </style>
 <?php
@@ -206 +204 @@
 endif;
 
-if ( ! function_exists( 'twentyten_the_page_number' ) ) :
-/**
- * Prints the page number currently being browsed, with a vertical bar before it.
- *
- * Used in Twenty Ten's header.php to add the page number to the <title> HTML tag.
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_the_page_number() {
-    global $paged; // Contains page number.
-    if ( $paged >= 2 )
-        echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), $paged );
-}
-endif;
+/**
+ * Makes some changes to the <title> tag, by filtering the output of wp_title().
+ *
+ * If we have a site description and we're viewing the home page or a blog posts
+ * page (when using a static front page), then we will add the site description.
+ *
+ * If we're viewing a search result, then we're going to recreate the title entirely.
+ * We're going to add page numbers to all titles as well, to the middle of a search
+ * result title and the end of all other titles.
+ *
+ * The site title also gets added to all titles.
+ *
+ * @since Twenty Ten 1.0
+ *
+ * @param string $title Title generated by wp_title()
+ * @param string $separator The separator passed to wp_title(). Twenty Ten uses a
+ *  vertical bar, "|", as a separator in header.php.
+ * @return string The new title, ready for the <title> tag.
+ */
+function twentyten_filter_wp_title( $title, $separator ) {
+    // The $paged global variable contains the page number of a listing of posts.
+    // The $page global variable contains the page number of a single post that is paged.
+    // We'll display whichever one applies, if we're not looking at the first page.
+    global $paged, $page;
+
+    if ( is_search() ) {
+        // If we're a search, let's start over:
+        $title = sprintf( __( 'Search results for %s', 'twentyten' ), '"' . get_search_query() . '"' );
+        // Add a page number if we're on page 2 or more:
+        if ( $paged >= 2 )
+            $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), $paged );
+        // Add the site name to the end:
+        $title .= " $separator " . get_bloginfo( 'name', 'display' );
+        // We're done. Let's send the new title back to wp_title():
+        return $title;
+    }
+
+    // Otherwise, let's start by adding the site name to the end:
+    $title .= get_bloginfo( 'name', 'display' );
+
+    // If we have a site description and we're on the home/front page, add the description:
+    $site_description = get_bloginfo( 'description', 'display' );
+    if ( $site_description && ( is_home() || is_front_page() ) )
+        $title .= " $separator " . $site_description;
+
+    // Add a page number if necessary:
+    if ( $paged >= 2 || $page >= 2 )
+        $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
+
+    // Return the new title to wp_title():
+    return $title;
+}
+add_filter( 'wp_title', 'twentyten_filter_wp_title', 10, 2 );
 
 /**
@@ -250 +287 @@
 
 /**
- * Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis.
+ * Returns 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">&rarr;</span>', 'twentyten' ) . '</a>';
+}
+
+/**
+ * Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis and twentyten_continue_reading_link().
  *
  * To override this in a child theme, remove the filter and add your own
@@ -259 +306 @@
  */
 function twentyten_auto_excerpt_more( $more ) {
-    return ' &hellip;';
+    return ' &hellip;' . twentyten_continue_reading_link();
 }
 add_filter( 'excerpt_more', 'twentyten_auto_excerpt_more' );
 
 /**
- * Adds a pretty "Continue Reading" link to post excerpts.
+ * Adds a pretty "Continue Reading" link to custom post excerpts.
  *
  * To override this link in a child theme, remove the filter and add your own
@@ -273 +320 @@
  */
 function twentyten_custom_excerpt_more( $output ) {
-    return $output . ' <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
+    if ( has_excerpt() && ! is_attachment() ) {
+        $output .= twentyten_continue_reading_link();
+    }
+    return $output;
 }
 add_filter( 'get_the_excerpt', 'twentyten_custom_excerpt_more' );
@@ -302 +352 @@
  */
 function twentyten_comment( $comment, $args, $depth ) {
-    $GLOBALS['comment'] = $comment; ?>
-    <?php if ( '' == $comment->comment_type ) : ?>
+    $GLOBALS['comment'] = $comment;
+    switch ( $comment->comment_type ) :
+        case '' :
+    ?>
     <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
         <div id="comment-<?php comment_ID(); ?>">
@@ -329 +381 @@
     </div><!-- #comment-##  -->
 
-    <?php else : ?>
+    <?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 endif;
+    <?php
+            break;
+    endswitch;
 }
 endif;
@@ -436 +494 @@
  */
 function twentyten_posted_on() {
-    printf( __( '<span %1$s>Posted on</span> %2$s by %3$s', 'twentyten' ),
-        'class="meta-prep meta-prep-author"',
-        sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep">',
+    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> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+        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' ) ),
             sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),