Ticket #4595: rss-patch.txt

Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php        (révision 5789)
+++ wp-includes/feed.php        (copie de travail)
@@ -206,4 +206,19 @@
        }
 }
 
-?>
\ Pas de fin de ligne à la fin du fichier
+function wp_dropdown_feeds ( $default = "rss2" ) {
+       $feeds = array ('rss' => 'RSS 0.92',
+                       'rss2' => 'RSS 2.0', 
+                       'rdf' => 'RSS 1.0', 
+                       'atom' => 'Atom');
+       $r = '';
+       foreach( $feeds as $feed => $name)
+               if ( $default == $feed ) // Make default first in list
+                       $p = "\n\t<option selected='selected' value='$feed'>$name</option>";
+               else
+                       $r .= "\n\t<option value='$feed'>$name</option>";
+       echo $p . $r;
+
+}
+
+?>
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php   (révision 5789)
+++ wp-includes/functions.php   (copie de travail)
@@ -769,7 +769,7 @@
        $feed = preg_replace('/^_+/', '', $feed);
 
        if ( $feed == '' || $feed == 'feed' )
-               $feed = 'rss2';
+               $feed = get_option('rss_format');
 
        $hook = 'do_feed_' . $feed;
        do_action($hook, $wp_query->is_comment_feed);
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php        (révision 5789)
+++ wp-admin/options-reading.php        (copie de travail)
@@ -62,6 +62,10 @@
 <legend><?php _e('Syndication Feeds') ?></legend> 
 <table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
+<th width="33%" scope="row"><?php _e('Feed format:') ?></th> 
+<td><select name="rss_format"><?php wp_dropdown_feeds( get_option('rss_format')); ?></select></td>
+</tr>
+<tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td> 
 </tr>
@@ -88,9 +92,9 @@
 </p>
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
+<input type="hidden" name="page_options" value="posts_per_page,rss_format,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
 </p> 
 </form> 
 </div> 
-<?php include('./admin-footer.php'); ?>
\ Pas de fin de ligne à la fin du fichier
+<?php include('./admin-footer.php'); ?>