Changeset 1514

Timestamp:

08/07/2004 06:12:54 PM (21 years ago)

Author:

rboren

Message:

Fix get_pagenum_link() to work with path info permalinks and permalinks without trailing slashes. Bug 0002040.

File:

• trunk/wp-includes/template-functions-links.php (modified) (1 diff)

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

@@ -332 +332 @@
       } elseif( '' != get_settings('permalink_structure')) {
          $permalink = 1;
-         $qstr = preg_replace('|(.*)/[^/]*|', '$1/', $qstr).$page_modstring.$pagenum;
+
+     // If it's not a path info permalink structure, trim the index.
+     if ( ! preg_match('#^/*' . get_settings('blogfilename') . '#', get_settings('permalink_structure'))) {
+       $qstr = preg_replace("#/*" . get_settings('blogfilename') . "/*#", '/', $qstr);
+     }
+
+     $qstr =  trailingslashit($qstr) . $page_modstring . $pagenum;
       } else {
          $qstr = get_settings('blogfilename') . $querystring_start.$page_querystring.$querystring_equal.$pagenum;