Changeset 4804

Show
Ignore:
Timestamp:
01/25/07 08:37:26 (2 years ago)
Author:
matt
Message:

Missed a file and an easy mistake.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-atom.php

    r4803 r4804  
    2222     
    2323    <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated> 
    24     <generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator> 
     24    <generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator> 
    2525 
    2626    <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" /> 
    …… 
    4141        <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published> 
    4242        <?php the_category_rss('atom') ?> 
    43         <summary type="<?php bloginfo('html_type'); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> 
     43        <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> 
    4444<?php if ( !get_option('rss_use_excerpt') ) : ?> 
    45         <content type="<?php bloginfo('html_type'); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content> 
     45        <content type="<?php html_type_rss(); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content> 
    4646<?php endif; ?> 
    4747<?php rss_enclosure(); ?> 

  • trunk/wp-includes/feed.php

    r4626 r4804  
    147147function get_the_category_rss($type = 'rss') { 
    148148    $categories = get_the_category(); 
     149    $home = get_bloginfo_rss('home'); 
    149150    $the_list = ''; 
    150151    foreach ( (array) $categories as $category ) { 
    …… 
    152153        if ( 'rdf' == $type ) 
    153154            $the_list .= "\n\t\t<dc:subject><![CDATA[$category->cat_name]]></dc:subject>\n"; 
     155        if ( 'atom' == $type ) 
     156            $the_list .= "<category scheme='$home' term='$category->cat_name' />"; 
    154157        else 
    155158            $the_list .= "\n\t\t<category><![CDATA[$category->cat_name]]></category>\n"; 
    …… 
    161164function the_category_rss($type = 'rss') { 
    162165    echo get_the_category_rss($type); 
     166} 
     167 
     168function html_type_rss() { 
     169    $type = bloginfo('html_type'); 
     170    if ( strstr( $type, 'xhtml' ) ) 
     171        $type = 'xhtml'; 
     172    else 
     173        $type = 'html'; 
     174    echo $type; 
    163175} 
    164176