Changeset 13494

Timestamp:

02/28/2010 09:40:42 AM (15 years ago)

Author:

dd32

Message:

Re-use /page/xx/ for Post Paging on Page_on_front. Few fixes related to paging on front page. Fixes #12391

Location:

trunk/wp-includes

Files:

• post-template.php (modified) (2 diffs)
• query.php (modified) (1 diff)

trunk/wp-includes/post-template.php

@@ -588 +588 @@
                     } else {
                         if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
+                            $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+                        elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
                         else
                             $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
@@ -607 +609 @@
                 if ( $i && $more ) {
                     if ( 1 == $i ) {
-                        $output .= '<a href="' . get_permalink() . '">' . $link_before. $previouspagelink . $link_after . '</a>';
+                        $output .= '<a href="' . get_permalink() . '">';
                     } else {
                         if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $previouspagelink . $link_after . '</a>';
+                            $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+                        elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
                         else
-                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $previouspagelink . $link_after . '</a>';
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
                     }
+                    $output .= $link_before. $previouspagelink . $link_after . '</a>';
                 }
                 $i = $page + 1;
                 if ( $i <= $numpages && $more ) {
                     if ( 1 == $i ) {
-                        $output .= '<a href="' . get_permalink() . '">' . $link_before. $nextpagelink . $link_after . '</a>';
+                        $output .= '<a href="' . get_permalink() . '">';
                     } else {
                         if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $nextpagelink . $link_after . '</a>';
+                            $output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+                        elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
                         else
-                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $nextpagelink . $link_after . '</a>';
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
                     }
+                    $output .= $link_before. $nextpagelink . $link_after . '</a>';
                 }
                 $output .= $after;

trunk/wp-includes/query.php

@@ -1481 +1481 @@
                     empty($this->query) ||
                     !empty($qv['preview']) ||
-                    !empty($qv['cpage'])
+                    !empty($qv['cpage']) ||
+                    !empty($qv['page']) ||
+                    !empty($qv['paged'])
                 ) ) {
             $this->is_page = true;
             $this->is_home = false;
             $qv['page_id'] = get_option('page_on_front');
+            // Correct <!--nextpage--> for page_on_front
+            if ( !empty($qv['paged']) ) {
+                $qv['page'] = $qv['paged'];
+                unset($qv['paged']);
+            }
         }