Changeset 4804

Timestamp:

01/25/2007 08:37:26 AM (20 years ago)

Author:

matt

Message:

Missed a file and an easy mistake.

Location:

trunk

Files:

• wp-atom.php (modified) (2 diffs)
• wp-includes/feed.php (modified) (3 diffs)

trunk/wp-atom.php

@@ -22 +22 @@
         
         <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
-        <generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
+        <generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
 
         <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
@@ -41 +41 @@
                 <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
                 <?php the_category_rss('atom') ?>
-                <summary type="<?php bloginfo('html_type'); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
+                <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
-                <content type="<?php bloginfo('html_type'); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
+                <content type="<?php html_type_rss(); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
 <?php endif; ?>
 <?php rss_enclosure(); ?>

trunk/wp-includes/feed.php

@@ -147 +147 @@
 function get_the_category_rss($type = 'rss') {
         $categories = get_the_category();
+        $home = get_bloginfo_rss('home');
         $the_list = '';
         foreach ( (array) $categories as $category ) {
@@ -152 +153 @@
                 if ( 'rdf' == $type )
                         $the_list .= "\n\t\t<dc:subject><![CDATA[$category->cat_name]]></dc:subject>\n";
+                if ( 'atom' == $type )
+                        $the_list .= "<category scheme='$home' term='$category->cat_name' />";
                 else
                         $the_list .= "\n\t\t<category><![CDATA[$category->cat_name]]></category>\n";
@@ -161 +164 @@
 function the_category_rss($type = 'rss') {
         echo get_the_category_rss($type);
+}
+
+function html_type_rss() {
+        $type = bloginfo('html_type');
+        if ( strstr( $type, 'xhtml' ) )
+                $type = 'xhtml';
+        else
+                $type = 'html';
+        echo $type;
 }