Revert r25824:25875 from the core.svn.wordpress.org repository.

These commits were accidentally re-synced commits from develop.svn.wordpress.org due to a race condition. Thankfully, the history of this repository matters fairly little. It also happened only for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@25876 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/feed-rdf.php

@@ -16,13 +16,13 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 	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 
+	<?php
 	/**
 	 * Fires at the end of the feed root to add namespaces.
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_ns' ); 
+	do_action( 'rdf_ns' );
 	?>
 >
 <channel rdf:about="<?php bloginfo_rss("url") ?>">
@@ -35,13 +35,13 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 	<?php /** This filter is documented in wp-includes/feed-rss2.php */ ?>
 	<sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
 	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-	<?php 
+	<?php
 	/**
 	 * Fires at the end of the RDF feed header.
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_header' ); 
+	do_action( 'rdf_header' );
 	?>
 	<items>
 		<rdf:Seq>
@@ -64,13 +64,13 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
 <?php endif; ?>
-	<?php 
+	<?php
 	/**
 	 * Fires at the end of each RDF feed item.
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_item' ); 
+	do_action( 'rdf_item' );
 	?>
 </item>
 <?php endwhile;  ?>