Ticket #7131: rewrite.diff

opt/lampp/htdocs/wordpress/wp-includes/rewrite.php

@@ -1338 +1338 @@
 
                         //create query for /page/xx
                         $pagematch = $match . $pageregex;
-                        $pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+                        $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);
+                        $commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
 
                         //create query for /feed/(feed|atom|rss|rss2|rdf)
                         $feedmatch = $match . $feedregex;
-                        $feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+                        $feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 
                         //create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex)
                         $feedmatch2 = $match . $feedregex2;
-                        $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+                        $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 
                         //if asked to, turn the feed queries into comment feed ones
                         if ($forcomments) {
-                                $feedquery .= '&withcomments=1';
-                                $feedquery2 .= '&withcomments=1';
+                                $feedquery .= '&withcomments=1';
+                                $feedquery2 .= '&withcomments=1';
                         }
 
                         //start creating the array of rewrites for this dir
@@ -1426 +1426 @@
 
                                         //create queries for these extra tag-ons we've just dealt with
                                         $subquery = $index . '?attachment=' . $this->preg_index(1);
-                                        $subtbquery = $subquery . '&tb=1';
-                                        $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-                                        $subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
+                                        $subtbquery = $subquery . '&tb=1';
+                                        $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
+                                        $subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
 
                                         //do endpoints for attachments
                                         if ( !empty($endpoint) ) { foreach ( (array) $ep_query_append as $regex => $ep ) {
@@ -1444 +1444 @@
 
                                         //allow URLs like <permalink>/2 for <permalink>/page/2
                                         $match = $match . '(/[0-9]+)?/?$';
-                                        $query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+                                        $query = $index . '?' . $query . '&amp;page=' . $this->preg_index($num_toks + 1);
                                 } else { //not matching a permalink so this is a lot simpler
                                         //close the match and finalise the query
                                         $match .= '?$';
@@ -1526 +1526 @@
                                                                 '.*wp-rss.php$' =>      $this->index .'?feed=rss',
                                                                 '.*wp-rss2.php$'        =>      $this->index .'?feed=rss2',
                                                                 '.*wp-feed.php$'        =>      $this->index .'?feed=feed',
-                                                                '.*wp-commentsrss2.php$'        =>      $this->index . '?feed=rss2&withcomments=1');
+                                                                '.*wp-commentsrss2.php$'        =>      $this->index . '?feed=rss2&amp;withcomments=1');
 
                 // Post
                 $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);