Changeset 1555

Timestamp:

08/23/2004 11:28:14 PM (21 years ago)

Author:

rboren

Message:

Fix a path info paging bug. Add using_mod_rewrite().

Location:

trunk/wp-includes

Files:

• functions.php (modified) (3 diffs)
• template-functions-links.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1164 +1164 @@
 }
 
+function using_mod_rewrite($permalink_structure = '') {
+    if (empty($permalink_structure)) {
+        $permalink_structure = get_settings('permalink_structure');
+    
+        if (empty($permalink_structure)) {
+            return false;
+        }
+    }
+
+    // If the index is not in the permalink, we're using mod_rewrite.
+    if (! preg_match('#^/*' . get_settings('blogfilename') . '#', $permalink_structure)) {
+      return true;
+    }
+    
+    return false;
+}
+
 function preg_index($number, $matches = '') {
     $match_prefix = '$';
@@ -1252 +1269 @@
     $num_tokens = count($tokens[0]);
 
-    $index = 'index.php';
-    $feedindex = 'index.php';
-    $trackbackindex = 'index.php';
+    $index = get_settings('blogfilename');;
+    $feedindex = $index;
+    $trackbackindex = $index;
     for ($i = 0; $i < $num_tokens; ++$i) {
              if (0 < $i) {
@@ -1335 +1352 @@
     $index = get_settings('blogfilename');
     $prefix = '';
-    if (preg_match('#^/*' . $index . '#', $front)) {
+    if (! using_mod_rewrite($permalink_structure)) {
         $prefix = $index . '/';
     }

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

@@ -350 +350 @@
 
      // If it's not a path info permalink structure, trim the index.
-     if ( ! preg_match('#^/*' . get_settings('blogfilename') . '#', get_settings('permalink_structure'))) {
+     if (using_mod_rewrite()) {
        $qstr = preg_replace("#/*" . get_settings('blogfilename') . "/*#", '/', $qstr);
+     } else {
+       // If using path info style permalinks, make sure the index is in
+       // the URI.
+       if (! strstr($qstr, get_settings('blogfilename'))) {
+         $qstr = '/' . get_settings('blogfilename') . $qstr;
+       }
      }