Changeset 25659 for trunk/src/wp-includes/rewrite.php

Timestamp:

10/02/2013 07:41:19 PM (12 years ago)

Author:

wonderboymusic

Message:

Make url_to_postid() work for custom post type URLs. Use get_post_types() and get_taxonomies() instead of directly accessing globals. Adds unit test.

Props faishal, for the globals fix.
Fixes #19744.

File:

• trunk/src/wp-includes/rewrite.php (modified) (2 diffs)

trunk/src/wp-includes/rewrite.php

@@ -339 +339 @@
 
     $request = $url;
+    $post_type_query_vars = array();
+
+    foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
+        if ( ! empty( $t->query_var ) )
+            $post_type_query_vars[ $t->query_var ] = $post_type;
+    }
 
     // Look for matches.
@@ -366 +372 @@
             // Filter out non-public query vars
             global $wp;
-            parse_str($query, $query_vars);
+            parse_str( $query, $query_vars );
             $query = array();
             foreach ( (array) $query_vars as $key => $value ) {
-                if ( in_array($key, $wp->public_query_vars) )
+                if ( in_array( $key, $wp->public_query_vars ) ){
                     $query[$key] = $value;
+                    if ( isset( $post_type_query_vars[$key] ) ) {
+                        $query['post_type'] = $post_type_query_vars[$key];
+                        $query['name'] = $value;
+                    }
+                }
             }
 
             // Do the query
-            $query = new WP_Query($query);
-            if ( !empty($query->posts) && $query->is_singular )
+            $query = new WP_Query( $query );
+            if ( ! empty( $query->posts ) && $query->is_singular )
                 return $query->post->ID;
             else