Changeset 4184

Timestamp:

09/11/2006 11:59:00 PM (17 years ago)

Author:

ryan

Message:

Show more link in RSS. Don't show more link if more link text empty. Take more into account when creating excerpt.

Location:

trunk

Files:

• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (2 diffs)
• wp-rss2.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -742 +742 @@
     global $post;
     if ( '' == $text ) {
-        $text = $post->post_content;
+        $text = get_the_content('');
         $text = apply_filters('the_content', $text);
         $text = str_replace(']]>', ']]>', $text);

trunk/wp-includes/post-template.php

@@ -83 +83 @@
     if ( preg_match('/<!--more(.+?)?-->/', $content, $matches) ) {
         $content = explode($matches[0], $content, 2);
-        if ( !empty($matches[1]) )
+        if ( !empty($matches[1]) && !empty($more_link_text) )
             $more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
     } else {
@@ -95 +95 @@
     $output .= $teaser;
     if ( count($content) > 1 ) {
-        if ( $more )
+        if ( $more ) {
             $output .= '<a id="more-'.$id.'"></a>'.$content[1];
-        else
-            $output = balanceTags($output . ' <a href="'. get_permalink() . "#more-$id\">$more_link_text</a>");
+        } else {
+            $output = balanceTags($output);
+            if ( ! empty($more_link_text) )
+                $output .= ' <a href="'. get_permalink() . "#more-$id\">$more_link_text</a>";
+        }
+            
     }
     if ( $preview ) // preview fix for javascript bug with foreign languages

trunk/wp-rss2.php

@@ -43 +43 @@
         <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
     <?php if ( strlen( $post->post_content ) > 0 ) : ?>
-        <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+        <content:encoded><![CDATA[<?php the_content() ?>]]></content:encoded>
     <?php else : ?>
         <content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>