Changeset 19779

Timestamp:

01/28/2012 09:00:59 PM (14 years ago)

Author:

duck_

Message:

Use new $args parameter for (WP_Rewrite::)add_permastruct(). Fixes #16092.

Use array_intersect_key() to keep WP_Rewrite::$extra_permastructs free of unnecessary/unknown keys + values.

Location:

trunk/wp-includes

Files:

• post.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -1028 +1028 @@
         }
 
-        $wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->rewrite['ep_mask'] );
+        $wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite );
     }
 

trunk/wp-includes/rewrite.php

@@ -1914 +1914 @@
             'endpoints' => true,
         );
+        $args = array_intersect_key( $args, $defaults );
         $args = wp_parse_args( $args, $defaults );
 

trunk/wp-includes/taxonomy.php

@@ -345 +345 @@
 
         $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-        $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front'], $args['rewrite']['ep_mask'] );
+        $wp_rewrite->add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
     }