Changeset 5702

Timestamp:

06/14/07 02:58:04 (1 year ago)

Author:

markjaquith

Message:

remove &paged=1 *before* we HTML entitize the link. fixes #4462

Files:

• branches/2.2/wp-includes/link-template.php (modified) (2 diffs)

branches/2.2/wp-includes/link-template.php

@@ -483 +483 @@
-    if ( $permalink )
-        $qstr = user_trailingslashit($qstr, 'paged');
-    $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_option('home') ) . $qstr );
-
-    // showing /page/1/ or ?paged=1 is redundant
@@ -491 +490 @@
-        $qstr = remove_query_arg('paged', $qstr); // for query style
-    }
+
+    $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_option('home') ) . $qstr );
+
-    return $qstr;
-}