Changeset 13774

Timestamp:

03/20/2010 02:23:52 AM (15 years ago)

Author:

dd32

Message:

Add hierarchical support for custom post_types in Rewrite Rules & Querying. See #12643

Location:

trunk/wp-includes

Files:

• link-template.php (modified) (3 diffs)
• post.php (modified) (3 diffs)
• query.php (modified) (2 diffs)
• rewrite.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -188 +188 @@
     $draft_or_pending = 'draft' == $post->post_status || 'pending' == $post->post_status;
 
+    $post_type = get_post_type_object($post->post_type);
+
     if ( !empty($post_link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-        $post_link = ( $leavename ) ? $post_link : str_replace("%$post->post_type%", $slug, $post_link);
+        if ( ! $leavename ) {
+            if ( $post_type->hierarchical )
+                $slug = get_page_uri($id);
+            $post_link = str_replace("%$post->post_type%", $slug, $post_link);
+        }
         $post_link = home_url( user_trailingslashit($post_link) );
     } else {
-        $post_type = get_post_type_object($post->post_type);
         if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
             $post_link = add_query_arg($post_type->query_var, $slug, '');
@@ -296 +301 @@
     $link = false;
 
-    if (! $id) {
+    if ( ! $id)
         $id = (int) $post->ID;
-    }
 
     $object = get_post($id);
@@ -307 +311 @@
         else
             $parentlink = get_permalink( $object->post_parent );
+
         if ( is_numeric($object->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
             $name = 'attachment/' . $object->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
         else
             $name = $object->post_name;
-        if (strpos($parentlink, '?') === false)
+
+        if ( strpos($parentlink, '?') === false )
             $link = user_trailingslashit( trailingslashit($parentlink) . $name );
     }
 
-    if (! $link ) {
+    if ( ! $link )
         $link = trailingslashit(get_bloginfo('url')) . "?attachment_id=$id";
-    }
 
     return apply_filters('attachment_link', $link, $id);

trunk/wp-includes/post.php

@@ -855 +855 @@
         if ( !isset($args->rewrite['with_front']) )
             $args->rewrite['with_front'] = true;
-        $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
+        if ( $args->hierarchical )
+            $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
+        else
+            $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
         $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);
     }
@@ -2750 +2753 @@
  * @return mixed Null when complete.
  */
-function get_page_by_path($page_path, $output = OBJECT) {
+function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
     global $wpdb;
     $page_path = rawurlencode(urldecode($page_path));
@@ -2762 +2765 @@
         $full_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
 
-    $pages = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = %s AND (post_type = 'page' OR post_type = 'attachment')", $leaf_path ));
+    $pages = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = %s AND (post_type = %s OR post_type = 'attachment')", $leaf_path, $post_type ));
 
     if ( empty($pages) )
         return null;
 
-    foreach ($pages as $page) {
+    foreach ( $pages as $page ) {
         $path = '/' . $leaf_path;
         $curpage = $page;
-        while ($curpage->post_parent != 0) {
-            $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type='page'", $curpage->post_parent ));
+        while ( $curpage->post_parent != 0 ) {
+            $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $curpage->post_parent, $post_type ));
             $path = '/' . $curpage->post_name . $path;
         }
 
         if ( $path == $full_path )
-            return get_page($page->ID, $output);
+            return get_page($page->ID, $output, $post_type);
     }
 

trunk/wp-includes/query.php

@@ -1713 +1713 @@
             $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
 
-        if ('' != $q['name']) {
+        if ( !empty($q['post_type']) && !empty($q[ $q['post_type'] ]) ) {
+            $q[ $q['post_type'] ] = str_replace('%2F', '/', urlencode(urldecode($q[ $q['post_type'] ])));
+            $post_type_object = get_post_type_object($q['post_type']);
+            if ( ! $post_type_object->hierarchical || strpos($q[ $q['post_type'] ], '/') === false) { 
+                $q['name'] = $q[ $q['post_type'] ] = sanitize_title($q[ $q['post_type'] ]);
+                $where .= " AND $wpdb->posts.post_name = '" . $q[ $q['post_type'] ] . "'";          
+            } else {
+                // Hierarchical post type, need to look deeper to see if its an attachment or this post_type
+                if ( isset($this->queried_object_id) ) {
+                    $reqpage = $this->queried_object_id;
+                } else {
+                    $reqpage = get_page_by_path($q[ $q['post_type'] ], OBJECT, $q['post_type']);
+                    if ( !empty($reqpage) )
+                        $reqpage = $reqpage->ID;
+                    else
+                        $reqpage = 0;
+                }
+                $where .= " AND ($wpdb->posts.ID = '$reqpage')";
+                $reqpage_obj = get_page($reqpage);
+                if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+                    $this->is_attachment = true;
+                    $q['attachment_id'] = $reqpage;
+                    $post_type = $q['post_type'] = 'attachment';
+                }
+            }
+        } elseif ( '' != $q['name'] ) {
             $q['name'] = sanitize_title($q['name']);
             $where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
-        } else if ('' != $q['pagename']) {
+        } elseif ( '' != $q['pagename'] ) {
             if ( isset($this->queried_object_id) )
                 $reqpage = $this->queried_object_id;
@@ -1728 +1753 @@
 
             $page_for_posts = get_option('page_for_posts');
-            if  ( ('page' != get_option('show_on_front') ) ||  empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
+            if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
                 $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
                 $page_paths = '/' . trim($q['pagename'], '/');

trunk/wp-includes/rewrite.php

@@ -1437 +1437 @@
                     foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
                         if ( strpos($struct, "%$ptype%") !== false ) {
+                            $ptype = get_post_type_object($ptype);
                             $post = true;
-                            $page = false;
+                            $page = $ptype->hierarchical; // This is for page style attachment url's
                             break;
                         }