[wp-cvs] wordpress wp-blog-header.php,1.97,1.98

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30806

Modified Files:
	wp-blog-header.php 
Log 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.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** wp-blog-header.php	27 Oct 2004 22:07:58 -0000	1.97
--- wp-blog-header.php	27 Oct 2004 23:58:39 -0000	1.98
***************
*** 151,169 ****
  if ( isset($doing_rss) && $doing_rss == 1 )
      $posts_per_page = get_settings('posts_per_rss');
- if ( !isset($posts_per_page) || $posts_per_page == 0 )
-     $posts_per_page = get_settings('posts_per_page');
- if ( !isset($what_to_show) )
-     $what_to_show = get_settings('what_to_show');
- if ( isset($showposts) && $showposts ) {
-     $showposts = (int) $showposts;
-     $posts_per_page = $showposts;
- }
- if ( !isset($nopaging) ) {
-   $nopaging = '';
- }
  
  $use_gzipcompression = get_settings('gzipcompression');
  
! $more_wpvars = array('posts_per_page', 'what_to_show', 'showposts', 'nopaging');
  
  // Construct the query string.
--- 151,158 ----
  if ( isset($doing_rss) && $doing_rss == 1 )
      $posts_per_page = get_settings('posts_per_rss');
  
  $use_gzipcompression = get_settings('gzipcompression');
  
! $more_wpvars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging');
  
  // Construct the query string.