fix rewrite for hierarchical posts

wp-bond · Nov 30, 2023 · 33029c1 · 33029c1
1 parent 325c7da
commit 33029c1
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Settings/Rewrite.php b/src/Settings/Rewrite.php
@@ -193,16 +193,16 @@ public static function postType(
         bool $year = false,
         array $extra_params = []
     ) {
-        static::archive(
+        static::single(
             $post_type,
             $path,
-            $paged,
-            $year,
             $extra_params
         );
-        static::single(
+        static::archive(
             $post_type,
             $path,
+            $paged,
+            $year,
             $extra_params
         );
     }
@@ -310,9 +310,10 @@ public static function single(
             }
 
             // rewrite
+            $match_regex = \is_post_type_hierarchical($post_type) ? '(.+?)' : '([^/]+)';
 
             \add_rewrite_rule(
-                $_path . '([^/]+)/?$',
+                $_path . $match_regex . '/?$',
                 'index.php?' . $post_type . '=$matches[1]'
                     . $params_string,
                 $order