Ticket #43789: 43789.diff

src/wp-includes/general-template.php

@@ -3783 +3783 @@
 
         // Append the format placeholder to the base URL.
         $pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
+        $pageone_link = $url_parts[0];
 
         // URL base depends on permalink settings.
         $format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
@@ -3873 +3874 @@
                         $dots         = true;
                 else :
                         if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-                                $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-                                $link = str_replace( '%#%', $n, $link );
+                                if ( $n == 1 ) {
+                                        $link = str_replace( '%_%', '', $pageone_link );
+                                } else {
+                                        $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+                                        $link = str_replace( '%#%', $n, $link );
+                                }
                                 if ( $add_args ) {
                                         $link = add_query_arg( $add_args, $link );
                                 }

src/wp-includes/link-template.php

@@ -2194 +2194 @@
 
         $pagenum = (int) $pagenum;
 
-        $request = remove_query_arg( 'paged' );
+        $request = false;
+
+        if ( is_paged() ) {
+                $object = get_queried_object();
+
+                if ( $object instanceof WP_Term ) {
+                        $request = get_term_link( $object );
+                } else if ( $object instanceof WP_Post ) {
+                        $request = get_permalink( $object );
+                }
+
+                if ( $request ) {
+                        $request = str_replace( home_url(), '', $request );
+                }
+        }
+
+        if ( ! $request ) {
+                $request = remove_query_arg( 'paged' );
+        }
 
         $home_root = parse_url( home_url() );
         $home_root = ( isset( $home_root['path'] ) ) ? $home_root['path'] : '';