Changeset 2535

Timestamp:

04/14/2005 04:24:22 AM (20 years ago)

Author:

ryan

Message:

Fix post paging regex to avoid regex collision between posts with slugs that differ only by a trailing number. ​http://mosquito.wordpress.org/view.php?id=1235

Location:

trunk/wp-includes

Files:

• classes.php (modified) (2 diffs)
• functions.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -253 +253 @@
             $q['posts_per_page'] = get_settings('posts_per_rss');
             $q['what_to_show'] = 'posts';
+        }
+
+        if (isset($q['page'])) {
+            $q['page'] = trim($q['page'], '/');
+            $q['page'] = (int) $q['page'];
         }
     
@@ -1124 +1129 @@
                     $trackbackmatch = $match . $trackbackregex;
                     $trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
-                    $match = $match . '?([0-9]+)?/?$';
+                    $match = rtrim($match, '/');
+                    $match = $match . '(/[0-9]+)?/?$';
                     $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
                 } else {

trunk/wp-includes/functions.php

@@ -880 +880 @@
     $currentmonth = mysql2date('m', $post->post_date);
     $numpages = 1;
+    $page = get_query_var('page');
     if (!$page)
         $page = 1;
-    if (isset($p))
+    if (is_single() || is_page())
         $more = 1;
     $content = $post->post_content;