WordPress.org

Make WordPress Core

Ticket #7092: 7092.diff

File 7092.diff, 6.5 KB (added by nacin, 4 years ago)
  • wp-admin/css/wp-admin-rtl.css

     
    555555} 
    556556/* ltr 
    557557=================================== */ 
    558 #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 { 
     558#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 { 
    559559        direction: ltr; 
    560560} 
  • wp-admin/includes/schema.php

     
    315315        'embed_autourls' => 1, 
    316316        'embed_size_w' => '', 
    317317        'embed_size_h' => 600, 
     318 
     319        // (future release) 
     320        'comments_per_rss' => get_option( 'posts_per_rss' ), 
    318321        ); 
    319322 
    320323        // Set autoload to no for these options 
  • wp-admin/options-reading.php

     
    6262</tr> 
    6363<tr valign="top"> 
    6464<th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent') ?></label></th> 
    65 <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> 
     65<td><fieldset><legend class="screen-reader-text"><span><?php _e('Syndication feeds show the most recent') ?> </span></legend> 
     66<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/> 
     67<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> 
     68</fieldset></td> 
    6669</tr> 
    6770<tr valign="top"> 
    6871<th scope="row"><?php _e('For each article in a feed, show') ?> </th> 
  • wp-admin/options.php

     
    2727        'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ), 
    2828        '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' ), 
    2929        'privacy' => array( 'blog_public' ), 
    30         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ), 
     30        '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' ), 
    3131        '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' ), 
    3232        'options' => array( '' ) ); 
    3333if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl'; 
  • wp-includes/formatting.php

     
    24792417 
    24802418                case 'posts_per_page': 
    24812419                case 'posts_per_rss': 
     2420                case 'comments_per_rss': 
    24822421                        $value = (int) $value; 
    24832422                        if ( empty($value) ) $value = 1; 
    24842423                        if ( $value < -1 ) $value = abs($value); 
  • wp-includes/query.php

     
    22022202                                $cwhere = apply_filters('comment_feed_where', $cwhere); 
    22032203                                $cgroupby = apply_filters('comment_feed_groupby', $cgroupby); 
    22042204                                $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC'); 
    2205                                 $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss')); 
     2205                                $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('comments_per_rss')); 
    22062206                        } 
    22072207                        $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : ''; 
    22082208                        $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : ''; 
     
    22762276                        $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : ''; 
    22772277                        $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC'); 
    22782278                        $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : ''; 
    2279                         $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss')); 
     2279                        $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('comments_per_rss')); 
    22802280                        $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits"; 
    22812281                        $this->comments = $wpdb->get_results($comments_request); 
    22822282                        $this->comment_count = count($this->comments);