More escaping of description and cleaner default feed URIs.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2005-01-22 03:45:35 +00:00
parent 25897c2b91
commit 2c5c76c12b
2 changed files with 4 additions and 4 deletions

View File

@ -187,14 +187,14 @@ function get_feed_link($feed='rss2') {
case 'comments_rss2':
$output = $feed_url .'/wp-commentsrss2.php';
if ($do_perma) {
$output = $comment_feed_url . '/rss2/';
$output = $comment_feed_url . '/';
}
break;
case 'rss2':
default:
$output = $feed_url .'/wp-rss2.php';
if ($do_perma) {
$output = $feed_url . '/rss2/';
$output = $feed_url . '/';
}
break;
}

View File

@ -35,9 +35,9 @@ $more = 1;
<guid><?php the_permalink($id); ?></guid>
<?php if (get_settings('rss_use_excerpt')) : ?>
<description><?php the_excerpt_rss() ?></description>
<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
<?php else : ?>
<description><?php the_excerpt_rss() ?></description>
<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
<?php if ( strlen( $post->post_content ) > 0 ) : ?>
<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
<?php else : ?>