Changeset 1536

Timestamp:

08/16/2004 10:50:06 PM (21 years ago)

Author:

rboren

Message:

Paging cleanup.

Location:

trunk

Files:

• wp-admin/edit.php (modified) (1 diff)
• wp-blog-header.php (modified) (1 diff)
• wp-includes/classes.php (modified) (1 diff)
• wp-includes/template-functions-links.php (modified) (2 diffs)

trunk/wp-admin/edit.php

@@ -93 +93 @@
 <?php
 if (empty($m)) $showposts = 15;
+$nopaging = true;
 include(ABSPATH.'wp-blog-header.php');
 

trunk/wp-blog-header.php

@@ -125 +125 @@
     $posts_per_page = $showposts;
 }
+if ( !isset($nopaging) ) {
+  $nopaging = '';
+}
 
 $archive_mode = get_settings('archive_mode');
 $use_gzipcompression = get_settings('gzipcompression');
 
-$more_wpvars = array('posts_per_page', 'what_to_show', 'showposts');
+$more_wpvars = array('posts_per_page', 'what_to_show', 'showposts', 'nopaging');
 
 // Construct the query string.

trunk/wp-includes/classes.php

@@ -395 +395 @@
         }
 
-        if ((!$whichcat) && (!$q['m']) && (!$q['p']) && (!$q['w']) && (!$q['s']) && empty($q['poststart']) && empty($q['postend'])) {
-            if ($q['what_to_show'] == 'posts') {
-                $limits = ' LIMIT '.$q['posts_per_page'];
-            } elseif ($q['what_to_show'] == 'days' && empty($q['monthnum']) && empty($q['year']) && empty($q['day'])) {
-                $lastpostdate = get_lastpostdate();
-                $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
-                $lastpostdate = mysql2date('U',$lastpostdate);
-                $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['posts_per_page']-1) * 86400)));
-                $where .= " AND post_date > '$otherdate'";
-            }
-        }
-
-        if ( !empty($q['postend']) && ($q['postend'] > $q['poststart']) && (!$q['m']) && empty($q['monthnum']) && empty($q['year']) && empty($q['day']) &&(!$q['w']) && (!$whichcat) && (!$q['s']) && (!$q['p'])) {
-            if ($q['what_to_show'] == 'posts') {
-                $q['poststart'] = intval($q['poststart']);
-                $q['postend'] = intval($q['postend']);
-                $limposts = $q['postend'] - $q['poststart'];
-                $limits = ' LIMIT '.$q['poststart'].','.$limposts;
-            } elseif ($q['what_to_show'] == 'days') {
-                $q['poststart'] = intval($q['poststart']);
-                $q['postend'] = intval($q['postend']);
-                $limposts = $q['postend'] - $q['poststart'];
-                $lastpostdate = get_lastpostdate();
-                $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
-                $lastpostdate = mysql2date('U',$lastpostdate);
-                $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['poststart'] -1) * 86400)));
-                $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['postend'] -1) * 86400)));
-                $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
-            }
-        } else {
-            if (($q['what_to_show'] == 'posts') && (! is_single()) && (!$q['more'])) {
-                if ($pagenow != 'post.php') {
-                    $pgstrt = '';
-                    if ($q['paged']) {
-                        $pgstrt = (intval($q['paged']) -1) * $q['posts_per_page'] . ', ';
-                    }
-                    $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
-                } else {
-                    if (($q['m']) || ($q['p']) || ($q['w']) || ($q['s']) || ($whichcat)) {
-                        $limits = '';
-                    } else {
-                        $pgstrt = '';
-                        if ($q['paged']) {
-                            $pgstrt = (intval($q['paged']) -1) * $q['posts_per_page'] . ', ';
-                        }
-                        $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
-                    }
-                }
-            }
-            elseif (($q['m']) || ($q['p']) || ($q['w']) || ($q['s']) || ($whichcat) || ($q['author']) || $q['monthnum'] || $q['year'] || $q['day']) {
-                $limits = '';
-            }
-        }
+    // Paging
+    if ( !empty($q['postend']) && ($q['postend'] > $q['poststart']) ) {
+      if ($q['what_to_show'] == 'posts') {
+        $q['poststart'] = intval($q['poststart']);
+        $q['postend'] = intval($q['postend']);
+        $limposts = $q['postend'] - $q['poststart'];
+        $limits = ' LIMIT '.$q['poststart'].','.$limposts;
+      } elseif ($q['what_to_show'] == 'days') {
+        $q['poststart'] = intval($q['poststart']);
+        $q['postend'] = intval($q['postend']);
+        $limposts = $q['postend'] - $q['poststart'];
+        $lastpostdate = get_lastpostdate();
+        $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
+        $lastpostdate = mysql2date('U',$lastpostdate);
+        $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['poststart'] -1) * 86400)));
+        $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['postend'] -1) * 86400)));
+        $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
+      }
+    } else if (empty($q['nopaging']) && ! is_single()) {
+      $page = $q['paged'];
+      if (empty($page)) {
+        $page = 1;
+      }
+
+      if (($q['what_to_show'] == 'posts')) {
+        $pgstrt = '';
+        $pgstrt = (intval($page) -1) * $q['posts_per_page'] . ', ';
+        $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
+      } elseif ($q['what_to_show'] == 'days') {
+        $lastpostdate = get_lastpostdate();
+        $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
+        $lastpostdate = mysql2date('U',$lastpostdate);
+        $startdate = date('Y-m-d H:i:s', ($lastpostdate - ((intval($page) -1) * ($q['posts_per_page']-1) * 86400)));
+        $enddate = date('Y-m-d H:i:s', ($lastpostdate - (intval($page) * ($q['posts_per_page']-1) * 86400)));
+        if ($page > 1) {
+          $where .= " AND post_date > '$enddate' AND post_date < '$startdate'";
+        } else {
+          $where .= " AND post_date > '$enddate'";
+        }
+      }
+    }
 
         if ($q['p'] == 'all') {

trunk/wp-includes/template-functions-links.php

@@ -430 +430 @@
     global $request, $posts_per_page, $wpdb;
     if (! is_single()) {
-        $nxt_request = $request;
-        if ($pos = strpos(strtoupper($request), 'LIMIT')) {
+        $show_what = get_query_var('what_to_show');
+
+    if (get_query_var('what_to_show') == 'posts') {
+      $nxt_request = $request;
+      if ($pos = strpos(strtoupper($request), 'LIMIT')) {
             $nxt_request = substr($request, 0, $pos);
-        }
-        $nxt_result = $wpdb->query($nxt_request);
-        $numposts = $wpdb->num_rows;
-        $max_page = ceil($numposts / $posts_per_page);
+      }
+
+      $nxt_result = $wpdb->query($nxt_request);
+      $numposts = $wpdb->num_rows;
+      $max_page = ceil($numposts / $posts_per_page);
+    } else {
+      $max_page = 999999;
+    }
+
         if ($max_page > 1) {
             previous_posts_link($prelabel);
@@ -445 +453 @@
 }
 
-
 ?>