Ticket #25229: wp-includes-feed-rdf.2.diff

wp-includes/feed-rdf.php

@@ -5 +5 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true );
 $more = 1;
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option( 'blog_charset' ).'"?'.'>'; ?>
 <rdf:RDF
         xmlns="http://purl.org/rss/1.0/"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16 +16 @@
         xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
         xmlns:admin="http://webns.net/mvcb/"
         xmlns:content="http://purl.org/rss/1.0/modules/content/"
-        <?php do_action('rdf_ns'); ?>
+        <?php 
+        /**
+         * Fires at the end of the feed root to add namespaces.
+         *
+         * @since 2.0.0
+         */
+        do_action( 'rdf_ns' ); 
+        ?>
 >
 <channel rdf:about="<?php bloginfo_rss("url") ?>">
-        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
-        <link><?php bloginfo_rss('url') ?></link>
-        <description><?php bloginfo_rss('description') ?></description>
-        <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>
+        <title><?php bloginfo_rss( 'name' ); wp_title_rss(); ?></title>
+        <link><?php bloginfo_rss( 'url' ) ?></link>
+        <description><?php bloginfo_rss( 'description' ) ?></description>
+        <dc:date><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_lastpostmodified( 'GMT' ), false ); ?></dc:date>
+        <?php //duplicate_hook ?>
         <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
+        <?php //duplicate_hook ?>
         <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
         <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-        <?php do_action('rdf_header'); ?>
+        <?php 
+        /**
+         * Fires at the end of the RDF feed header.
+         *
+         * @since 2.0.0
+         */
+        do_action( 'rdf_header' ); 
+        ?>
         <items>
                 <rdf:Seq>
-                <?php while (have_posts()): the_post(); ?>
+                <?php while ( have_posts() ): the_post(); ?>
                         <rdf:li rdf:resource="<?php the_permalink_rss() ?>"/>
                 <?php endwhile; ?>
                 </rdf:Seq>
         </items>
 </channel>
-<?php rewind_posts(); while (have_posts()): the_post(); ?>
+<?php rewind_posts(); while ( have_posts() ): the_post(); ?>
 <item rdf:about="<?php the_permalink_rss() ?>">
         <title><?php the_title_rss() ?></title>
         <link><?php the_permalink_rss() ?></link>
-        <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt, false); ?></dc:date>
+        <dc:date><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', $post->post_date_gmt, false ); ?></dc:date>
         <dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
-        <?php the_category_rss('rdf') ?>
-<?php if (get_option('rss_use_excerpt')) : ?>
+        <?php the_category_rss( 'rdf' ) ?>
+<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
         <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php else : ?>
         <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-        <content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
+        <content:encoded><![CDATA[<?php the_content_feed( 'rdf' ) ?>]]></content:encoded>
 <?php endif; ?>
-        <?php do_action('rdf_item'); ?>
+        <?php 
+        /**
+         * Fires at the end of each RDF feed item.
+         *
+         * @since 2.0.0
+         */
+        do_action( 'rdf_item' ); 
+        ?>
 </item>
 <?php endwhile;  ?>
 </rdf:RDF>