Changeset 5481

Timestamp:

05/16/2007 02:47:24 AM (18 years ago)

Author:

rob1n

Message:

Fix get_pagenum_link(). fixes #3930

File:

• trunk/wp-includes/link-template.php (modified) (4 diffs)

trunk/wp-includes/link-template.php

@@ -474 +474 @@
     $home_root = preg_quote( trailingslashit( $home_root ), '|' );
     
-    $request = preg_replace('|^'. $home_root . '|', '', $qstr);
-    $request = preg_replace('|^/+|', '', $qstr);
-    
-    $index = $_SERVER['PHP_SELF'];
-    $index = preg_replace('|^'. $home_root . '|', '', $index);
-    $index = preg_replace('|^/+|', '', $index);
+    $request = preg_replace('|^'. $home_root . '|', '', $request);
+    $request = preg_replace('|^/+|', '', $request);
     
     if ( !$wp_rewrite->using_permalinks() ) {
@@ -485 +481 @@
         
         if ( $pagenum > 1 ) {
-            $result = add_query_arg( 'paged', $pagenum, $request );
+            $result = add_query_arg( 'paged', $pagenum, $base . $request );
         } else {
             $result = $base . $request;
         }
     } else {
+        $request = preg_replace( '|/?page/(.+)/?$|', '', $request);
+        
         $qs_regex = '|\?.*?$|';
         preg_match( $qs_regex, $request, $qs_match );
@@ -500 +498 @@
         }
         
-        $base = get_bloginfo( 'home' ) . '/';
+        $base = trailingslashit( get_bloginfo( 'url' ) );
         
         if ( $wp_rewrite->using_index_permalinks() && $pagenum > 1 ) {
@@ -506 +504 @@
         }
         
-        $request = ( $pagenum > 1 ) ? $request . user_trailingslashit( 'page/' . $pagenum, 'paged' ) : $request;
+        if ( $pagenum > 1 ) {
+            $request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( 'page/' . $pagenum, 'paged' );
+        } else {
+            $request = user_trailingslashit( $request );
+        }
+        
         $result = $base . $request . $query_string;
     }