More escaping of description and cleaner default feed URIs.

m · m · commit 2f13f79e7604 · 2005-01-22T03:45:35.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@2118 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php
@@ -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;
     }
diff --git a/wp-rss2.php b/wp-rss2.php
@@ -35,9 +35,9 @@
 
 		<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 : ?>

Original file line number	Diff line number	Diff line change
`@@ -187,14 +187,14 @@ function get_feed_link($feed='rss2') {`
`187`	`187`	`case 'comments_rss2':`
`188`	`188`	`$output = $feed_url .'/wp-commentsrss2.php';`
`189`	`189`	`if ($do_perma) {`
`190`		`- $output = $comment_feed_url . '/rss2/';`
	`190`	`+ $output = $comment_feed_url . '/';`
`191`	`191`	`}`
`192`	`192`	`break;`
`193`	`193`	`case 'rss2':`
`194`	`194`	`default:`
`195`	`195`	`$output = $feed_url .'/wp-rss2.php';`
`196`	`196`	`if ($do_perma) {`
`197`		`- $output = $feed_url . '/rss2/';`
	`197`	`+ $output = $feed_url . '/';`
`198`	`198`	`}`
`199`	`199`	`break;`
`200`	`200`	`}`