Changeset 13113

Timestamp:

02/13/2010 04:45:16 PM (15 years ago)

Author:

westi

Message:

Add the generator element in feeds through the {rss2|atom|rdf|rss|opml}_head hooks. Fixes #6947 props sivel.

Location:

trunk

Files:

• wp-app.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/feed-atom-comments.php (modified) (1 diff)
• wp-includes/feed-atom.php (modified) (1 diff)
• wp-includes/feed-rdf.php (modified) (1 diff)
• wp-includes/feed-rss.php (modified) (1 diff)
• wp-includes/feed-rss2-comments.php (modified) (1 diff)
• wp-includes/feed-rss2.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-links-opml.php (modified) (1 diff)

trunk/wp-app.php

@@ -1097 +1097 @@
 <link rel="self" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($self_page) ?>" />
 <rights type="text">Copyright <?php echo date('Y'); ?></rights>
-<?php the_generator( 'atom' ); ?>
 <?php do_action('app_head'); ?>
 <?php if ( have_posts() ) {

trunk/wp-includes/default-filters.php

@@ -185 +185 @@
 add_action( 'wp_head',             'rel_canonical'                        );
 add_action( 'wp_footer',           'wp_print_footer_scripts'              );
+
+// Feed Generator Tags
+foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
+    add_action( $action, 'the_generator' );
+}
 
 // WP Cron

trunk/wp-includes/feed-atom-comments.php

@@ -26 +26 @@
 
     <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT'), false); ?></updated>
-    <?php the_generator( 'atom' ); ?>
 
 <?php if ( is_singular() ) { ?>

trunk/wp-includes/feed-atom.php

@@ -21 +21 @@
 
     <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
-    <?php the_generator( 'atom' ); ?>
 
     <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />

trunk/wp-includes/feed-rdf.php

@@ -24 +24 @@
     <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 the_generator( 'rdf' ); ?>
     <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
     <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>

trunk/wp-includes/feed-rss.php

@@ -10 +10 @@
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<?php the_generator( 'comment' ); ?>
 <rss version="0.92">
 <channel>

trunk/wp-includes/feed-rss2-comments.php

@@ -30 +30 @@
     <description><?php bloginfo_rss("description") ?></description>
     <lastBuildDate><?php echo mysql2date('r', get_lastcommentmodified('GMT')); ?></lastBuildDate>
-    <?php the_generator( 'rss2' ); ?>
     <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
     <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>

trunk/wp-includes/feed-rss2.php

@@ -27 +27 @@
     <description><?php bloginfo_rss("description") ?></description>
     <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
-    <?php the_generator( 'rss2' ); ?>
     <language><?php echo get_option('rss_language'); ?></language>
     <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>

trunk/wp-includes/general-template.php

@@ -2131 +2131 @@
  * @return string The HTML content for the generator.
  */
-function get_the_generator( $type ) {
-    switch ($type) {
+function get_the_generator( $type = '' ) {
+    if ( empty( $type ) ) {
+
+        $current_filter = current_filter();
+        if ( empty( $current_filter ) )
+            return;
+
+        switch ( $current_filter ) {
+            case 'rss2_head' :
+            case 'commentsrss2_head' :
+                $type = 'rss2';
+                break;
+            case 'rss_head' :
+            case 'opml_head' :
+                $type = 'comment';
+                break;
+            case 'rdf_header' :
+                $type = 'rdf';
+                break;
+            case 'atom_head' :
+            case 'comments_atom_head' :
+            case 'app_head' :
+                $type = 'atom';
+                break;
+        }
+    }
+
+    switch ( $type ) {
         case 'html':
             $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';

trunk/wp-links-opml.php

@@ -27 +27 @@
 }
 ?><?php echo '<?xml version="1.0"?'.">\n"; ?>
-<?php the_generator( 'comment' ); ?>
 <opml version="1.0">
     <head>
         <title>Links for <?php echo esc_attr(get_bloginfo('name', 'display').$cat_name); ?></title>
         <dateCreated><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</dateCreated>
+        <?php do_action('opml_head'); ?>
     </head>
     <body>