git-svn-id: http://svn.automattic.com/wordpress/trunk@2299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2005-02-13 19:42:22 +00:00
parent 9a11067cf3
commit 1b8050d0d3
2 changed files with 2 additions and 4 deletions

View File

@ -145,10 +145,6 @@ if ( is_404() ) {
} }
} }
// Getting settings from DB
if ( isset($doing_rss) && $doing_rss == 1 )
$posts_per_page = get_settings('posts_per_rss');
$use_gzipcompression = get_settings('gzipcompression'); $use_gzipcompression = get_settings('gzipcompression');
$more_wpvars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging'); $more_wpvars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging');

View File

@ -244,6 +244,8 @@ class WP_Query {
$q['nopaging'] = false; $q['nopaging'] = false;
} }
} }
if ( $this->is_feed )
$q['posts_per_page'] = get_settings('posts_per_rss');
$add_hours = intval(get_settings('gmt_offset')); $add_hours = intval(get_settings('gmt_offset'));
$add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours)); $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));