Changeset 2803

Timestamp:

08/23/2005 07:43:11 AM (20 years ago)

Author:

matt

Message:

Fixes #1357

File:

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

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

@@ -410 +410 @@
     $qstr = preg_replace('|^/+|', '', $qstr);
     if ($permalink) $qstr = trailingslashit($qstr);
-    return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
+    $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
+    
+    // showing /page/1/ or ?paged=1 is redundant
+    if ($pagenum === 1) {
+        $qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style
+        $qstr = remove_query_arg('paged', $qstr); // for query style
+    }
+    return $qstr;
 }