Ticket #3964: fix_ep_root_rewrite.diff

wp-includes/rewrite.php

@@ -582 +582 @@
                         if ($paged) //...and /page/xx ones
                                 $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 
+                        //do endpoints
+                        if ($endpoints) {
+                                foreach ($ep_query_append as $regex => $ep) {
+                                        //add the endpoints on if the mask fits
+                                        if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific) {
+                                                $rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+                                        }
+                                }
+                        }
+
                         //if we've got some tags in this dir
                         if ($num_toks) {
                                 $post = false;
@@ -599 +609 @@
                                                 $page = true;
                                 }
 
-                                //do endpoints
-                                if ($endpoints) {
-                                        foreach ($ep_query_append as $regex => $ep) {
-                                                //add the endpoints on if the mask fits
-                                                if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific) {
-                                                        $rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
-                                                }
-                                        }
-                                }
-
                                 //if we're creating rules for a permalink, do all the endpoints like attachments etc
                                 if ($post) {
                                         $post = true;