Changeset 2046

Show
Ignore:
Timestamp:
01/04/05 23:30:10 (4 years ago)
Author:
rboren
Message:

Feed fixes from MooKitty.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-atom.php

    r1888 r2046  
    3434        <?php the_category_rss('rdf') ?> 
    3535        <summary type="text/html" mode="escaped"><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></summary> 
    36 <?php if (!get_settings('rss_use_excerpt')) { ?> 
     36<?php if (!get_settings('rss_use_excerpt')) : ?> 
     37    <?php if ( strlen( $post->post_content ) ) : ?> 
    3738        <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content> 
    38 <?php } ?> 
     39    <?php else : ?> 
     40        <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></content> 
     41    <?php endif; ?> 
     42<?php else : ?> 
     43        <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss('', 2) ?>]]></content> 
     44<?php endif; ?> 
    3945    </entry> 
    4046    <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?> 
  • trunk/wp-includes/template-functions-post.php

    r2029 r2046  
    143143} 
    144144 
    145 function the_excerpt_rss($cut = 0, $encode_html = 0) { 
     145function the_excerpt_rss($cut = 0, $encode_html = FALSE) { 
    146146    $output = get_the_excerpt(true); 
    147147 
     
    153153        $output = wp_specialchars($output); 
    154154        $cut = 0; 
    155     } elseif ($encode_html == 0) { 
     155    } elseif ($encode_html === 0) { 
    156156        $output = make_url_footnote($output); 
    157157    } elseif ($encode_html == 2) { 
  • trunk/wp-rss2.php

    r1888 r2046  
    3939<?php else : ?> 
    4040        <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description> 
     41    <?php if ( strlen( $post->post_content ) ) : ?> 
    4142        <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded> 
     43    <?php else : ?> 
     44        <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded> 
     45    <?php endif; ?> 
    4246<?php endif; ?> 
    4347        <wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>