Changeset 6377

Timestamp:

12/12/2007 11:45:55 AM (17 years ago)

Author:

ryan

Message:

Query page attachments from page requests so that they can both use the same set of rewrite rules. see #3614

Location:

trunk/wp-includes

Files:

• post.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -977 +977 @@
         $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'", $leaf_path ));
+    $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 ));
 
     if ( empty($pages) )

trunk/wp-includes/query.php

@@ -842 +842 @@
                 $q['name'] = $q['pagename'];
                 $where .= " AND (ID = '$reqpage')";
+                $reqpage_obj = get_page($reqpage);
+                if ( 'attachment' == $reqpage_obj->post_type ) {
+                    $this->is_attachment = true;
+                    $this->is_page = false;
+                    $q['attachment_id'] = $reqpage;
+                }
             }
         } elseif ('' != $q['attachment']) {