Changeset 1835

Show
Ignore:
Timestamp:
10/27/04 23:58:40 (4 years ago)
Author:
rboren
Message:

Add $post_per_archive_page to override the number of posts to show for an archive page. Turn off paging if $post_per_* are set to -1.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-blog-header.php

    r1834 r1835  
    151151if ( isset($doing_rss) && $doing_rss == 1 ) 
    152152    $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 } 
    164153 
    165154$use_gzipcompression = get_settings('gzipcompression'); 
    166155 
    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'); 
    168157 
    169158// Construct the query string. 
  • trunk/wp-includes/classes.php

    r1759 r1835  
    213213            $q['posts_per_page'] = $q['showposts']; 
    214214        } 
    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     
    216225        $add_hours = intval(get_settings('gmt_offset')); 
    217226        $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));