[wp-cvs] wordpress wp-atom.php, 1.15, 1.16 wp-rdf.php, 1.21,
1.22 wp-rss.php, 1.21, 1.22 wp-rss2.php, 1.30, 1.31
Matthew Mullenweg
saxmatt at users.sourceforge.net
Fri Jan 7 22:02:01 GMT 2005
- Previous message: [wp-cvs] wordpress/wp-admin options.php,1.38,1.39
- Next message: [wp-cvs] wordpress/wp-includes feed-functions.php, NONE,
1.1 comment-functions.php, 1.11,
1.12 template-functions-author.php, 1.16,
1.17 template-functions-category.php, 1.46,
1.47 template-functions-general.php, 1.61,
1.62 template-functions-links.php, 1.46,
1.47 template-functions-post.php, 1.37,
1.38 template-functions.php, 1.54, 1.55 vars.php, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25435
Modified Files:
wp-atom.php wp-rdf.php wp-rss.php wp-rss2.php
Log Message:
Some feed template function cleanup.
Index: wp-rss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss2.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wp-rss2.php 4 Jan 2005 23:30:09 -0000 1.30
--- wp-rss2.php 7 Jan 2005 22:01:58 -0000 1.31
***************
*** 13,17 ****
<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
! <!-- generator="wordpress/<?php echo $wp_version ?>" -->
<rss version="2.0"
xmlns:content="http://purl.org/rss/1.0/modules/content/"
--- 13,17 ----
<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
! <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" -->
<rss version="2.0"
xmlns:content="http://purl.org/rss/1.0/modules/content/"
***************
*** 20,29 ****
<channel>
! <title><?php bloginfo_rss('name') ?></title>
<link><?php bloginfo_rss('url') ?></link>
<description><?php bloginfo_rss("description") ?></description>
- <copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate()); ?></copyright>
<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
! <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
--- 20,28 ----
<channel>
! <title><?php bloginfo_rss('name'); ?></title>
<link><?php bloginfo_rss('url') ?></link>
<description><?php bloginfo_rss("description") ?></description>
<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), 0); ?></pubDate>
! <generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
***************
*** 32,66 ****
<link><?php permalink_single_rss() ?></link>
<comments><?php comments_link(); ?></comments>
! <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', $post->post_date_gmt, 0); ?></pubDate>
<?php the_category_rss() ?>
<guid><?php the_permalink($id); ?></guid>
<?php if (get_settings('rss_use_excerpt')) : ?>
! <description><?php the_excerpt_rss('', 2) ?></description>
<?php else : ?>
! <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
! <?php if ( strlen( $post->post_content ) ) : ?>
<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
- <?php else : ?>
- <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
- <?php endif; ?>
<?php endif; ?>
<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
! <?php
! $custom_fields = get_post_custom();
! if( is_array( $custom_fields ) ) {
! while( list( $key, $val ) = each( $custom_fields ) ) {
! if( $key == 'enclosure' ) {
! if (is_array($val)) {
! foreach($val as $enc) {
! $enclosure = split( "\n", $enc );
! print "<enclosure url='".trim( $enclosure[ 0 ] )."' length='".trim( $enclosure[ 1 ] )."' type='".trim( $enclosure[ 2 ] )."'/>\n";
! }
! }
! }
! }
! }
! ?>
</item>
<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
</channel>
! </rss>
--- 31,48 ----
<link><?php permalink_single_rss() ?></link>
<comments><?php comments_link(); ?></comments>
! <pubDate><?php the_time('D, d M Y H:i:s +0000'); ?></pubDate>
<?php the_category_rss() ?>
+
<guid><?php the_permalink($id); ?></guid>
<?php if (get_settings('rss_use_excerpt')) : ?>
! <description><?php the_excerpt_rss() ?></description>
<?php else : ?>
! <description><?php the_excerpt_rss() ?></description>
<content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
<?php endif; ?>
<wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
! <?php rss_enclosure(); ?>
</item>
<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
</channel>
! </rss>
\ No newline at end of file
Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wp-atom.php 4 Jan 2005 23:30:09 -0000 1.15
--- wp-atom.php 7 Jan 2005 22:01:58 -0000 1.16
***************
*** 16,24 ****
xmlns:dc="http://purl.org/dc/elements/1.1/">
<title><?php bloginfo_rss('name') ?></title>
! <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
<tagline><?php bloginfo_rss("description") ?></tagline>
<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></modified>
<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></copyright>
! <generator url="http://wordpress.org/" version="<?php echo $wp_version ?>">WordPress</generator>
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
--- 16,24 ----
xmlns:dc="http://purl.org/dc/elements/1.1/">
<title><?php bloginfo_rss('name') ?></title>
! <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
<tagline><?php bloginfo_rss("description") ?></tagline>
<modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></modified>
<copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></copyright>
! <generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
***************
*** 29,37 ****
<title><?php the_title_rss() ?></title>
<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
! <id><?php bloginfo_rss("url") ?>?p=<?php echo $id; ?></id>
! <modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_modified_gmt); ?></modified>
! <issued><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt); ?></issued>
<?php the_category_rss('rdf') ?>
! <summary type="text/html" mode="escaped"><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></summary>
<?php if (!get_settings('rss_use_excerpt')) : ?>
<?php if ( strlen( $post->post_content ) ) : ?>
--- 29,37 ----
<title><?php the_title_rss() ?></title>
<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
! <id><?php the_guid(); ?></id>
! <modified><?php the_time('Y-m-d\TH:i:s\Z'); ?></modified>
! <issued> <?php the_time('Y-m-d\TH:i:s\Z'); ?></issued>
<?php the_category_rss('rdf') ?>
! <summary type="text/html" mode="escaped"><?php the_excerpt_rss(); ?></summary>
<?php if (!get_settings('rss_use_excerpt')) : ?>
<?php if ( strlen( $post->post_content ) ) : ?>
***************
*** 41,45 ****
<?php endif; ?>
<?php else : ?>
! <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss('', 2) ?>]]></content>
<?php endif; ?>
</entry>
--- 41,45 ----
<?php endif; ?>
<?php else : ?>
! <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
<?php endif; ?>
</entry>
Index: wp-rdf.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rdf.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wp-rdf.php 27 Nov 2004 00:42:55 -0000 1.21
--- wp-rdf.php 7 Jan 2005 22:01:58 -0000 1.22
***************
*** 47,51 ****
<?php the_category_rss('rdf') ?>
<?php if (get_settings('rss_use_excerpt')) : ?>
! <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
<?php else : ?>
<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
--- 47,51 ----
<?php the_category_rss('rdf') ?>
<?php if (get_settings('rss_use_excerpt')) : ?>
! <description><?php the_excerpt_rss() ?></description>
<?php else : ?>
<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
Index: wp-rss.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wp-rss.php 27 Nov 2004 00:42:55 -0000 1.21
--- wp-rss.php 7 Jan 2005 22:01:58 -0000 1.22
***************
*** 27,31 ****
if (get_settings('rss_use_excerpt')) {
?>
! <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>
<?php
} else { // use content
--- 27,31 ----
if (get_settings('rss_use_excerpt')) {
?>
! <description><?php the_excerpt_rss() ?></description>
<?php
} else { // use content
- Previous message: [wp-cvs] wordpress/wp-admin options.php,1.38,1.39
- Next message: [wp-cvs] wordpress/wp-includes feed-functions.php, NONE,
1.1 comment-functions.php, 1.11,
1.12 template-functions-author.php, 1.16,
1.17 template-functions-category.php, 1.46,
1.47 template-functions-general.php, 1.61,
1.62 template-functions-links.php, 1.46,
1.47 template-functions-post.php, 1.37,
1.38 template-functions.php, 1.54, 1.55 vars.php, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list