Changeset 9300

Timestamp:

10/23/2008 06:55:22 PM (18 years ago)

Author:

ryan

Message:

pretty permalinks for comment paging. Props Viper007Bind. fixes #7942

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (2 diffs)
• link-template.php (modified) (2 diffs)
• rewrite.php (modified) (7 diffs)
• version.php (modified) (2 diffs)

trunk/wp-includes/canonical.php

@@ -124 +124 @@
 
         // paging and feeds
-                if ( get_query_var('paged') || is_feed() ) {
+                if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
                         if ( !$redirect_url )
                                 $redirect_url = $requested_url;
                         $paged_redirect = @parse_url($redirect_url);
-                        while ( preg_match( '#page/[0-9]+?(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/feed(/[a-z0-9-]*?(/+)?)?$#', $paged_redirect['path'] ) ) {
+                        while ( preg_match( '#page/[0-9]+?(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/feed(/[a-z0-9-]*?(/+)?)?$#', $paged_redirect['path'] ) || preg_match( '#comment-page-[0-9]+/?$#', $paged_redirect['path'] ) ) {
                                 // Strip off paging and feed
                                 $paged_redirect['path'] = preg_replace('#/page/[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing paging
                                 $paged_redirect['path'] = preg_replace('#/feed(/[a-z0-9-]*?(/+)?)?$#', '/', $paged_redirect['path']); // strip off any existing feed
+                                $paged_redirect['path'] = preg_replace('#comment-page-[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing comment paging
                         }
 
@@ -149 +150 @@
                                 $paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'feed/' . ( ( 'rss2' ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
                         }
+                        if ( get_query_var('cpage') > 1 ) {
+                                $paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'comment-page-' . get_query_var('cpage'), 'commentpaged' );
+                        }
                         $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
                         $redirect['path'] = $paged_redirect['path'];
                         $redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
-                        $redirect['query'] = remove_query_arg(  'feed', $redirect['query'] );
+                        $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
+                        $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
                 }
         }

trunk/wp-includes/link-template.php

@@ -1243 +1243 @@
 */
 function paginate_comments_links($args = array()) {
-        global $wp_query;
+        global $wp_query, $wp_rewrite;
 
         if ( !is_singular() )
@@ -1260 +1260 @@
                 'add_fragment' => '#comments'
         );
+        if ( $wp_rewrite->using_permalinks() )
+                $defaults['base'] = user_trailingslashit(get_permalink() . 'comment-page-%#%', 'commentpaged');
+
         $args = wp_parse_args( $args, $defaults );
         $page_links = paginate_links( $args );

trunk/wp-includes/rewrite.php

@@ -1260 +1260 @@
                 $trackbackregex = 'trackback/?$';
                 $pageregex = 'page/?([0-9]{1,})/?$';
+                $commentregex = 'comment-page-([0-9]{1,})/?$';
 
                 //build up an array of endpoint regexes to append => queries to append
@@ -1340 +1341 @@
                         $pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
 
+                        //create query for /comment-page-xx
+                        $commentmatch = $match . $commentregex;
+                        $commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
+
                         //create query for /feed/(feed|atom|rss|rss2|rdf)
                         $feedmatch = $match . $feedregex;
@@ -1360 +1365 @@
                         if ($paged) //...and /page/xx ones
                                 $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
+
+                        //only on pages with comments add ../comment-page-xx/
+                        if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask || EP_NONE & $ep_mask )
+                                $rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
 
                         //do endpoints
@@ -1404 +1413 @@
                                         $sub1feed = $sub1 . $feedregex; //and <permalink>/feed/(atom|...)
                                         $sub1feed2 = $sub1 . $feedregex2; //and <permalink>/(feed|atom...)
+                                        $sub1comment = $sub1 . $commentregex; //and <permalink>/comment-page-xx
                                         //add an ? as we don't have to match that last slash, and finally a $ so we
                                         //match to the end of the URL
@@ -1413 +1423 @@
                                         $sub2feed = $sub2 . $feedregex;    //feeds, <permalink>/attachment/feed/(atom|...)
                                         $sub2feed2 = $sub2 . $feedregex2;  //and feeds again on to this <permalink>/attachment/(feed|atom...)
+                                        $sub2comment = $sub2 . $commentregex; //and <permalink>/comment-page-xx
 
                                         //create queries for these extra tag-ons we've just dealt with
@@ -1418 +1429 @@
                                         $subtbquery = $subquery . '&tb=1';
                                         $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
+                                        $subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
 
                                         //do endpoints for attachments
@@ -1452 +1464 @@
                                         //add regexes/queries for attachments, attachment trackbacks and so on
                                         if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
-                                                $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
-                                        $rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery), $rewrite);
+                                                $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery, $sub1comment => $subcommentquery));
+                                        $rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery), $rewrite);
                                 }
                         } //if($num_toks)

trunk/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '2.7-almost-beta-9296';
+$wp_version = '2.7-almost-beta-9300';
 
 /**
@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 9296;
+$wp_db_version = 9300;
 
 ?>