Changeset 7491

Timestamp:

03/23/08 17:02:11 (3 months ago)

Author:

ryan

Message:

Taxonomy queries and urls. Props andy. see #6357

Files:

• trunk/wp-admin/includes/media.php (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (16 diffs)
• trunk/wp-includes/rewrite.php (modified) (2 diffs)
• trunk/wp-includes/taxonomy.php (modified) (1 diff)
• trunk/wp-includes/template-loader.php (modified) (3 diffs)
• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -1226 +1226 @@
-add_action('admin_head_media_upload_library_form', 'media_admin_css');
-
-
-register_taxonomy(
-    'image_tags',
-    'attachment:image',
-    array(
-        'label' => __('Tags'),
-        'template' => __('Tags: %l'),
-        'sort' => false,
-    )
-);
-
-// Any 'attachment' taxonomy will be included in the description input form for the multi uploader
-// Example:
-/*
-register_taxonomy(
-    'image_people',
-    'attachment:image',
-    array(
-        'label' => __('People'),
-        'template' => __('People: %l'),
-        'helps' => __('Left to right, top to bottom.'),
-        'sort' => true,
-        'args' => array(
-            'orderby' => 'term_order'
-        )
-    )
-);
-*/
-/*
-register_taxonomy('movie_director', 'attachment:video', array('label'=>__('Directors'), 'template'=>__('Directed by %l.')));
-register_taxonomy('movie_producer', 'attachment:video', array('label'=>__('Producers'), 'template'=>__('Produced by %l.')));
-register_taxonomy('movie_screenwriter', 'attachment:video', array('label'=>__('Screenwriter'), 'template'=>__('Screenplay by %l.')));
-register_taxonomy('movie_actor', 'attachment:video', array('label'=>__('Cast'), 'template'=>array(__('Cast: %l.')));
-register_taxonomy('movie_crew', 'attachment:video', array('label'=>__('Crew'), 'template'=>array(__('Crew: %l.')));
-*/
-
-?>

trunk/wp-includes/classes.php

@@ -2 +2 @@
-
-class WP {
-
+, 'taxonomy', 'term'
-
-    var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm');

trunk/wp-includes/default-filters.php

@@ -107 +107 @@
-add_filter('the_content', 'convert_chars');
-add_filter('the_content', 'wpautop');
+add_filter('the_content', 'prepend_attachment');
-
-add_filter('the_excerpt', 'wptexturize');

trunk/wp-includes/post-template.php

@@ -502 +502 @@
-
-function prepend_attachment($content) {
+    global $post;
+
+    if ( empty($post->post_type) || $post->post_type != 'attachment' )
+        return;
+
-    $p = '<p class="attachment">';
-    // show the medium sized image representation of the attachment if available, and link to the raw file

trunk/wp-includes/query.php

@@ -115 +115 @@
-
-    if ( in_array( $tag_obj->slug, $slug ) )
+        return true;
+
+    return false;
+}
+
+function is_tax( $slug = '' ) {
+    global $wp_query;
+    
+    if ( !$wp_query->is_tax )
+        return false;
+
+    if ( empty($slug) )
+        return true;
+
+    $term = $wp_query->get_queried_object();
+
+    $slug = (array) $slug;
+
+    if ( in_array( $term->slug, $slug ) )
-        return true;
-
@@ -371 +390 @@
-    var $is_category = false;
-    var $is_tag = false;
+    var $is_tax = false;
-    var $is_search = false;
-    var $is_feed = false;
@@ -396 +416 @@
-        $this->is_category = false;
-        $this->is_tag = false;
+        $this->is_tax = false;
-        $this->is_search = false;
-        $this->is_feed = false;
@@ -658 +679 @@
-            }
-
+            if ( empty($qv['taxonomy']) || empty($qv['term']) ) {
+                $this->is_tax = false;
+            } else {
+                $this->is_tax = true;
+            }
+
-            if ( empty($qv['author']) || ($qv['author'] == '0') ) {
-                $this->is_author = false;
@@ -841 +868 @@
-        if ( $q['m'] ) {
-            $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
-' AND YEAR(post_date)='
+" AND YEAR($wpdb->posts.post_date)="
-            if (strlen($q['m'])>5)
-' AND MONTH(post_date)='
+" AND MONTH($wpdb->posts.post_date)="
-            if (strlen($q['m'])>7)
-' AND DAYOFMONTH(post_date)='
+" AND DAYOFMONTH($wpdb->posts.post_date)="
-            if (strlen($q['m'])>9)
-' AND HOUR(post_date)='
+" AND HOUR($wpdb->posts.post_date)="
-            if (strlen($q['m'])>11)
-' AND MINUTE(post_date)='
+" AND MINUTE($wpdb->posts.post_date)="
-            if (strlen($q['m'])>13)
-' AND SECOND(post_date)='
+" AND SECOND($wpdb->posts.post_date)="
-        }
-
-        if ( '' !== $q['hour'] )
-
+$wpdb->posts.
-
-        if ( '' !== $q['minute'] )
-
+$wpdb->posts.
-
-        if ( '' !== $q['second'] )
-
+$wpdb->posts.
-
-        if ( $q['year'] )
-
+$wpdb->posts.
-
-        if ( $q['monthnum'] )
-
+$wpdb->posts.
-
-        if ( $q['day'] )
-
+$wpdb->posts.
-
-        if ('' != $q['name']) {
-            $q['name'] = sanitize_title($q['name']);
-
+$wpdb->posts.
-        } else if ('' != $q['pagename']) {
-            if ( isset($this->queried_object_id) )
@@ -904 +931 @@
-            $q['attachment'] = sanitize_title(basename($attach_paths));
-            $q['name'] = $q['attachment'];
-
+$wpdb->posts.
-        }
-
-        if ( $q['w'] )
-
+$wpdb->posts.
-
-        if ( intval($q['comments_popup']) )
@@ -942 +969 @@
-            foreach((array)$q['search_terms'] as $term) {
-                $term = addslashes_gpc($term);
-post_title LIKE '{$n}{$term}{$n}') OR (
+$wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.
-                $searchand = ' AND ';
-            }
-            $term = $wpdb->escape($q['s']);
-            if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
-post_title LIKE '{$n}{$term}{$n}') OR (
+$wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.
-
-            if ( !empty($search) )
@@ -1113 +1140 @@
-        }
-
+        // Taxonomies
+        if ( $this->is_tax ) {
+            $terms = get_terms($q['taxonomy'], array('slug'=>$q['term']));
+            foreach ( $terms as $term )
+                $term_ids[] = $term->term_id;
+            $post_ids = get_objects_in_term($term_ids, $q['taxonomy']);
+
+            if ( count($post_ids) ) {
+                $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
+                $post_type = 'any';
+                $q['post_status'] = 'publish';
+                $post_status_join = true;
+            } else {
+                $whichcat = " AND 0 = 1";
+            }
+        }
+
-        // Author/user stuff
-
@@ -1130 +1174 @@
-            }
-            $author_array = preg_split('/[,\s]+/', $q['author']);
-' AND (post_author '
+" AND ($wpdb->posts.post_author "
-            for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
-' post_author '
+" $wpdb->posts.post_author "
-            }
-            $whichauthor .= ')';
@@ -1150 +1194 @@
-            $q['author_name'] = sanitize_title($q['author_name']);
-            $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
-' AND (post_author = '
+" AND ($wpdb->posts.post_author = "
-        }
-
@@ -1165 +1209 @@
-        // Order by
-        if ( empty($q['orderby']) ) {
-'post_date '
+"$wpdb->posts.post_date "
-        } else {
-            // Used to filter values
@@ -1181 +1225 @@
-                    case 'menu_order':
-                    case 'ID':
+                        $orderby = "$wpdb->posts.ID";
-                        break;
-                    case 'rand':
@@ -1186 +1231 @@
-                        break;
-                    default:
-'post_'
+"$wpdb->posts.post_"
-                }
-                if ( in_array($orderby_array[$i], $allowed_keys) )
@@ -1196 +1241 @@
-
-            if ( empty($q['orderby']) )
-'post_date '
+"$wpdb->posts.post_date "
-        }
-
-        if ( $this->is_attachment ) {
-
+$wpdb->posts.
-        } elseif ($this->is_page) {
-
+$wpdb->posts.
-        } elseif ($this->is_single) {
-
+$wpdb->posts.
-        } elseif ( 'any' == $post_type ) {
-            $where .= '';
-        } else {
-
+$wpdb->posts.
-        }
-
-        if ( isset($q['post_status']) && '' != $q['post_status'] ) {
+            $statuswheres = array();
-            $q_status = explode(',', $q['post_status']);
-            $r_status = array();
-            $p_status = array();
-            if ( in_array( 'draft'  , $q_status ) )
-
+$wpdb->posts.
-            if ( in_array( 'pending', $q_status ) )
-
+$wpdb->posts.
-            if ( in_array( 'future' , $q_status ) )
-
+$wpdb->posts.
-            if ( in_array( 'inherit' , $q_status ) )
-
+$wpdb->posts.
-            if ( in_array( 'private', $q_status ) )
-
+$wpdb->posts.
-            if ( in_array( 'publish', $q_status ) )
-
+$wpdb->posts.
-
-            if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
@@ -1235 +1281 @@
-            if ( !empty($r_status) ) {
-                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can("edit_others_{$post_type}s") )
-where .= " AND (
+statuswheres[] = "($wpdb->posts.
-                else
-where .= " AND 
+statuswheres[] = "
-            }
-            if ( !empty($p_status) ) {
-                if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can("read_private_{$post_type}s") )
-where .= " AND (
+statuswheres[] = "($wpdb->posts.
-                else
-
-
+
+
+
+
+
+
+
+
+
-        } elseif ( !$this->is_singular ) {
-
+$wpdb->posts.
-
-            if ( is_admin() )
-post_status = 'future' OR post_status = 'draft' OR 
+$wpdb->posts.post_status = 'future' OR $wpdb->posts.post_status = 'draft' OR $wpdb->posts.
-
-            if ( is_user_logged_in() ) {
-post_status = 'private'" : " OR post_author = $user_ID AND 
+$wpdb->posts.post_status = 'private'" : " OR $wpdb->posts.post_author = $user_ID AND $wpdb->posts.
-            }
-
@@ -1505 +1558 @@
-            $this->queried_object = &$tag;
-            $this->queried_object_id = (int) $tag_id;
+        } else if ($this->is_tax) {
+            $tax = $this->get('taxonomy');
+            $slug = $this->get('term');
+            $term = &get_terms($tax, array('slug'=>$slug));
+            if ( is_wp_error($term) )
+                return $term;
+            $this->queried_object = $term;
+            $this->queried_object_id = $term->term_id;
-        } else if ($this->is_posts_page) {
-            $this->queried_object = & get_page(get_option('page_for_posts'));

trunk/wp-includes/rewrite.php

@@ -831 +831 @@
-        $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
-
+        // Extra permastructs
+        $extra_rewrite = array();
+        foreach ( $this->extra_permastructs as $permastruct )
+            $extra_rewrite = array_merge($extra_rewrite, $this->generate_rewrite_rules($permastruct, EP_NONE));
+
-        // Put them together.
-        if ( $this->use_verbose_page_rules )
-
+extra_rewrite, $
-        else
-
+extra_rewrite, $
-
-        do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -949 +954 @@
-    }
-
+    function add_permastruct($struct, $with_front = true) {
+        if ( $with_front )
+            $struct = $this->front . $struct;
+        $this->extra_permastructs[] = $struct;
+    }
+
-    function flush_rules() {
-        delete_option('rewrite_rules');

trunk/wp-includes/taxonomy.php

@@ -146 +146 @@
- */
-function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
-
+, $wp_rewrite
-
-    $defaults = array('hierarchical' => false, 'update_count_callback' => '');
-    $args = wp_parse_args($args, $defaults);
+
+    if ( !empty( $args['rewrite'] ) ) {
+        if ( !is_array($args['rewrite']) )
+            $args['rewrite'] = array();
+        if ( !isset($args['rewrite']['slug']) )
+            $args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
+        $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', "taxonomy=$taxonomy&term=");
+        $wp_rewrite->add_permastruct("{$args['rewrite']['slug']}/%$taxonomy%");
+    }
-
-    $args['name'] = $taxonomy;

trunk/wp-includes/template-loader.php

@@ -25 +25 @@
-        return;
-    } else if ( is_attachment() && $template = get_attachment_template() ) {
+        remove_filter('the_content', 'prepend_attachment');
-        include($template);
-        return;
-    } else if ( is_single() && $template = get_single_template() ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
-        include($template);
-        return;
-    } else if ( is_page() && $template = get_page_template() ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
-        include($template);
-        return;
@@ -41 +38 @@
-        return;
-    } else if ( is_tag() && $template = get_tag_template()) {
+        include($template);
+        return;
+    } else if ( is_tax() && $template = get_taxonomy_template()) {
-        include($template);
-        return;
@@ -59 +59 @@
-        return;
-    } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
-        include(TEMPLATEPATH . "/index.php");
-        return;

trunk/wp-includes/theme.php

@@ -382 +382 @@
-}
-
+function get_taxonomy_template() {
+    $template = '';
+    $taxonomy = get_query_var('taxonomy');
+    $term = get_query_var('term');
+    if ( $taxonomy && $term && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php") )
+        $template = TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php";
+    elseif ( $taxonomy && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy.php") )
+        $template = TEMPLATEPATH . "/taxonomy-$taxonomy.php";
+    elseif ( file_exists(TEMPLATEPATH . "/taxonomy.php") )
+        $template = TEMPLATEPATH . "/taxonomy.php";
+
+    return apply_filters('taxonomy_template', $template);
+}
-
-function get_date_template() {