Changeset 34215

Timestamp:

09/15/2015 06:53:12 PM (10 years ago)

Author:

wonderboymusic

Message:

In WP::parse_request(), don't add query vars of non-viewable post types to WP::public_query_vars. In register_post_type(), don't add query vars of non-viewable post types to WP::public_query_vars.
In _unregister_post_type() (unit tests), don't add query vars of non-viewable post types to WP::public_query_vars.

Adds unit test.

Fixes #30018.

Location:

trunk

Files:

• src/wp-includes/class-wp.php (modified) (1 diff)
• src/wp-includes/post-functions.php (modified) (1 diff)
• tests/phpunit/includes/utils.php (modified) (1 diff)
• tests/phpunit/tests/rewrite.php (modified) (1 diff)

trunk/src/wp-includes/class-wp.php

@@ -262 +262 @@
         $this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
 
-        foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )
-            if ( $t->query_var )
+        foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
+            if ( is_post_type_viewable( $t ) && $t->query_var ) {
                 $post_type_query_vars[$t->query_var] = $post_type;
+            }
+        }
 
         foreach ( $this->public_query_vars as $wpvar ) {

trunk/src/wp-includes/post-functions.php

@@ -1073 +1073 @@
     }
 
-    if ( false !== $args->query_var && ! empty( $wp ) ) {
+    if ( false !== $args->query_var ) {
         if ( true === $args->query_var )
             $args->query_var = $post_type;
         else
             $args->query_var = sanitize_title_with_dashes( $args->query_var );
-        $wp->add_query_var( $args->query_var );
+
+        if ( $wp && is_post_type_viewable( $args ) ) {
+            $wp->add_query_var( $args->query_var );
+        }
     }
 

trunk/tests/phpunit/includes/utils.php

@@ -363 +363 @@
 
     foreach ( get_post_types( array() , 'objects' ) as $t ) {
-        if ( ! empty( $t->query_var ) )
+        if ( is_post_type_viewable( $t ) && ! empty( $t->query_var ) )
             $GLOBALS['wp']->add_query_var( $t->query_var );
     }

trunk/tests/phpunit/tests/rewrite.php

@@ -145 +145 @@
     }
 
+    /**
+     * @ticket 30018
+     */
+    function test_parse_request_home_path_non_public_type() {
+        register_post_type( 'foo', array( 'public' => false ) );
+
+        $url = add_query_arg( 'foo', '1', home_url() );
+
+        $this->go_to( $url );
+
+        _unregister_post_type( 'foo' );
+
+        $this->assertEquals( array(), $GLOBALS['wp']->query_vars );
+    }
+
     function test_url_to_postid_dupe_path() {
         update_option( 'home', home_url('/example/') );