Changeset 1145

Timestamp:

04/24/2004 08:12:58 PM (21 years ago)

Author:

saxmatt

Message:

Correctly respect excerpt wishes.

Location:

trunk

Files:

• wp-rdf.php (modified) (2 diffs)
• wp-rss2.php (modified) (2 diffs)

trunk/wp-rdf.php

@@ -5 +5 @@
     require('wp-blog-header.php');
 }
+$more = 1;
 
 header('Content-type: application/rss+xml', true);
@@ -45 +46 @@
     <dc:creator><?php the_author() ?> (mailto:<?php the_author_email() ?>)</dc:creator>
     <?php the_category_rss('rdf') ?>
-<?php $more = 1; if (get_settings('rss_use_excerpt')) {
-?>
+<?php if (get_settings('rss_use_excerpt')) : ?>
     <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
-<?php
-} else { // use content
-?>
+<?php else : ?>
     <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
-<?php
-} // end else use content
-?>
     <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+<?php endif; ?>
+    
 </item>
 <?php } }  ?>

trunk/wp-rss2.php

@@ -5 +5 @@
     require('wp-blog-header.php');
 }
-
+$more = 1;
 $charset = get_settings('blog_charset');
 if (!$charset) $charset = 'UTF-8';
-header('Content-type: application/rss+xml', true);
+header('Content-type: text/xml', true);
 
 ?>
@@ -34 +34 @@
         <?php the_category_rss() ?>
         <guid><?php the_permalink($id); ?></guid>
-<?php $more = 1; if (get_settings('rss_use_excerpt')) {
-?>
+<?php if (get_settings('rss_use_excerpt')) : ?>
         <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
-<?php
-} else { // use content
-?>
+<?php else : ?>
         <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
-<?php
-} // end else use content
-?>
         <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
+<?php endif; ?>
+        
     </item>
     <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>