Changeset 1835
- Timestamp:
- 10/27/04 23:58:40 (4 years ago)
- Files:
-
- trunk/wp-blog-header.php (modified) (1 diff)
- trunk/wp-includes/classes.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-blog-header.php
r1834 r1835 151 151 if ( isset($doing_rss) && $doing_rss == 1 ) 152 152 $posts_per_page = get_settings('posts_per_rss'); 153 if ( !isset($posts_per_page) || $posts_per_page == 0 )154 $posts_per_page = get_settings('posts_per_page');155 if ( !isset($what_to_show) )156 $what_to_show = get_settings('what_to_show');157 if ( isset($showposts) && $showposts ) {158 $showposts = (int) $showposts;159 $posts_per_page = $showposts;160 }161 if ( !isset($nopaging) ) {162 $nopaging = '';163 }164 153 165 154 $use_gzipcompression = get_settings('gzipcompression'); 166 155 167 $more_wpvars = array('posts_per_page', ' what_to_show', 'showposts', 'nopaging');156 $more_wpvars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging'); 168 157 169 158 // Construct the query string. trunk/wp-includes/classes.php
r1759 r1835 213 213 $q['posts_per_page'] = $q['showposts']; 214 214 } 215 215 if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && (is_archive() || is_search()) ) 216 $q['posts_per_page'] = $q['posts_per_archive_page']; 217 if ( !isset($q['nopaging']) ) { 218 if ($q['posts_per_page'] == -1) { 219 $q['nopaging'] = true; 220 } else { 221 $q['nopaging'] = false; 222 } 223 } 224 216 225 $add_hours = intval(get_settings('gmt_offset')); 217 226 $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
