Ticket #7092: 7092.diff

wp-admin/css/wp-admin-rtl.css

@@ -555 +555 @@
 }
 /* ltr
 =================================== */
-#author-email, #author-url, #rss-url-1, #edit-slug-box, #post_name, #trackback_url, #metakeyinput, #post_password, #slug, #category_nicename, #link_url, #link_image, #rss_uri, #menu_order, #email, #newcomment_author_url, #pages-exclude, #template textarea, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #siteurl, #home, #admin_email, #gmt_offset, #default_post_edit_rows, #mailserver_url, #mailserver_login, #mailserver_pass, #mailserver_port, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #close_comments_days_old, #comments_per_page, #comment_max_links, #moderation_keys, #blacklist_keys, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #large_size_w, #large_size_h, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #rules {
+#author-email, #author-url, #rss-url-1, #edit-slug-box, #post_name, #trackback_url, #metakeyinput, #post_password, #slug, #category_nicename, #link_url, #link_image, #rss_uri, #menu_order, #email, #newcomment_author_url, #pages-exclude, #template textarea, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #siteurl, #home, #admin_email, #gmt_offset, #default_post_edit_rows, #mailserver_url, #mailserver_login, #mailserver_pass, #mailserver_port, #ping_sites, #posts_per_page, #posts_per_rss, #comments_per_rss, #blog_charset, #close_comments_days_old, #comments_per_page, #comment_max_links, #moderation_keys, #blacklist_keys, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #large_size_w, #large_size_h, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #rules {
         direction: ltr;
 }

wp-admin/includes/schema.php

@@ -315 +315 @@
         'embed_autourls' => 1,
         'embed_size_w' => '',
         'embed_size_h' => 600,
+
+        // (future release)
+        'comments_per_rss' => get_option( 'posts_per_rss' ),
         );
 
         // Set autoload to no for these options

wp-admin/options-reading.php

@@ -62 +62 @@
 </tr>
 <tr valign="top">
 <th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent') ?></label></th>
-<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" class="small-text" /> <?php _e('posts') ?></td>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Syndication feeds show the most recent') ?> </span></legend>
+<p><label><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" class="small-text" /> <?php _e('posts') ?></label><br/>
+<label><input name="comments_per_rss" type="text" id="comments_per_rss" value="<?php form_option('comments_per_rss'); ?>" class="small-text" /> <?php _e('comments') ?></label></p>
+</fieldset></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('For each article in a feed, show') ?> </th>

wp-admin/options.php

@@ -27 +27 @@
         'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
         'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
         'privacy' => array( 'blog_public' ),
-        'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
+        'reading' => array( 'posts_per_page', 'posts_per_rss', 'comments_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
         'writing' => array( 'default_post_edit_rows', 'use_smilies', 'ping_sites', 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
         'options' => array( '' ) );
 if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';

wp-includes/formatting.php

@@ -2479 +2417 @@
 
                 case 'posts_per_page':
                 case 'posts_per_rss':
+                case 'comments_per_rss':
                         $value = (int) $value;
                         if ( empty($value) ) $value = 1;
                         if ( $value < -1 ) $value = abs($value);

wp-includes/query.php

@@ -2202 +2202 @@
                                 $cwhere = apply_filters('comment_feed_where', $cwhere);
                                 $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
                                 $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC');
-                                $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'));
+                                $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('comments_per_rss'));
                         }
                         $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
                         $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
@@ -2276 +2276 @@
                         $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
                         $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC');
                         $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
-                        $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'));
+                        $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('comments_per_rss'));
                         $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits";
                         $this->comments = $wpdb->get_results($comments_request);
                         $this->comment_count = count($this->comments);