Ticket #13361: fancier_excerpts.diff

Index: functions.php
===================================================================
--- functions.php       (revision 14875)
+++ functions.php       (working copy)
@@ -244,18 +244,32 @@
 add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
 
 /**
- * Sets the "read more" link to something pretty.
+ * Replaces the traditional "[…]" for marking of excerpts with a pretty "Continue Reading" link
  *
+ * @since Twenty Ten 1.0
+ * @return replace the traditional "[…]" for marking of excerpts with a pretty "Continue Reading" link
+ */
+function twentyten_auto_excerpt_more( $more ) {
+       return $more .= ' &hellip; <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';;
+}
+add_filter( 'excerpt_more', 'twentyten_auto_excerpt_more' );
+
+/**
+ * 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
  * function tied to the excerpt_more filter hook.
  *
  * @since Twenty Ten 1.0
- * @return string A pretty 'Continue reading' link.
+ * @return add a pretty "Continue Reading" link to custom post excerpts
  */
-function twentyten_excerpt_more( $more ) {
-       return ' &hellip; <a href="'. get_permalink() . '">' . __('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
+function twentyten_custom_excerpt_more( $output ) {
+       if ( has_excerpt() ) {
+               $output .= ' &hellip; <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
+       }
+       return $output;
 }
-add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
+add_filter( 'get_the_excerpt', 'twentyten_custom_excerpt_more' );
 
 /**
  * Remove inline styles printed when the gallery shortcode is used.