Ticket #6357: 6357.diff

wp-includes/default-filters.php

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

wp-includes/post-template.php

@@ -501 +501 @@
-}
-
-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
-        $p .= wp_get_attachment_link(0, 'medium', false);

wp-includes/taxonomy.php

@@ -145 +145 @@
- * @param array|string $args See above description for the two keys values.
- */
-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;
-        $args['object_type'] = $object_type;
-        $wp_taxonomies[$taxonomy] = (object) $args;

wp-includes/template-loader.php

@@ -24 +24 @@
-                include($template);
-                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;
-        } else if ( is_category() && $template = get_category_template()) {
@@ -42 +39 @@
-        } else if ( is_tag() && $template = get_tag_template()) {
-                include($template);
-                return;
+        } else if ( is_tax() && $template = get_taxonomy_template()) {
+                include($template);
+                return;
-        } else if ( is_author() && $template = get_author_template() ) {
-                include($template);
-                return;
@@ -58 +58 @@
-                include($template);
-                return;
-        } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
-                if ( is_attachment() )
-                        add_filter('the_content', 'prepend_attachment');
-                include(TEMPLATEPATH . "/index.php");
-                return;
-        }

wp-includes/theme.php

@@ -381 +381 @@
-        return apply_filters('tag_template', $template);
-}
-
+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() {
-        return get_query_template('date');
-}

wp-includes/query.php

@@ -119 +119 @@
-        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;
+
+        return false;
+}
+
-function is_comments_popup () {
-        global $wp_query;
-
@@ -370 +389 @@
-        var $is_author = false;
-        var $is_category = false;
-        var $is_tag = false;
+        var $is_tax = false;
-        var $is_search = false;
-        var $is_feed = false;
-        var $is_comment_feed = false;
@@ -395 +415 @@
-                $this->is_author = false;
-                $this->is_category = false;
-                $this->is_tag = false;
+                $this->is_tax = false;
-                $this->is_search = false;
-                $this->is_feed = false;
-                $this->is_comment_feed = false;
@@ -657 +678 @@
-                                $this->is_tag = true;
-                        }
-
+                        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;
-                        } else {
@@ -840 +867 @@
-                // If a month is specified in the querystring, load that month
-                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) )
-                                $reqpage = $this->queried_object_id;
@@ -903 +930 @@
-                        $attach_paths = '/' . trim($q['attachment'], '/');
-                        $q['attachment'] = sanitize_title(basename($attach_paths));
-                        $q['name'] = $q['attachment'];
-
+$wpdb->posts.
-                }
-
-                if ( $q['w'] )
-
+$wpdb->posts.
-
-                if ( intval($q['comments_popup']) )
-                        $q['p'] = intval($q['comments_popup']);
@@ -941 +968 @@
-                        $searchand = '';
-                        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) )
-                                $search = " AND ({$search}) ";
@@ -1112 +1139 @@
-                        }
-                }
-
+                // 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
-
-                if ( empty($q['author']) || ($q['author'] == '0') ) {
@@ -1129 +1173 @@
-                                $andor = 'OR';
-                        }
-                        $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 .= ')';
-                }
@@ -1149 +1193 @@
-                        }
-                        $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 = "
-                }
-
-                // MIME-Type stuff for attachment browsing
@@ -1164 +1208 @@
-
-                // Order by
-                if ( empty($q['orderby']) ) {
-'post_date '
+"$wpdb->posts.post_date "
-                } else {
-                        // Used to filter values
-                        $allowed_keys = array('author', 'date', 'category', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand');
@@ -1180 +1224 @@
-                                switch ($orderby) {
-                                        case 'menu_order':
-                                        case 'ID':
+                                                $orderby = "$wpdb->posts.ID";
-                                                break;
-                                        case 'rand':
-                                                $orderby = 'RAND()';
-                                                break;
-                                        default:
-'post_'
+"$wpdb->posts.post_"
-                                }
-                                if ( in_array($orderby_array[$i], $allowed_keys) )
-                                        $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
@@ -1195 +1240 @@
-                                $q['orderby'] .= " {$q['order']}";
-
-                        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'] ) {
-                                $r_status = array_merge($r_status, $p_status);
@@ -1234 +1280 @@
-
-                        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
-where .= " AND 
+statuswheres[] = "
-                        }
+                        if ( $post_status_join ) {
+                                $join .= " INNER JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
+                                foreach ( $statuswheres as $index => $statuswhere )
+                                        $statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
+                        }
+                        foreach ( $statuswheres as $statuswhere )
+                                $where .= " AND $statuswhere";
-                } 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.
-                        }
-
-                        $where .= ')';
@@ -1504 +1557 @@
-                                return $tag;
-                        $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'));
-                        $this->queried_object_id = (int) $this->queried_object->ID;

wp-includes/rewrite.php

@@ -830 +830 @@
-                $page_rewrite = $this->page_rewrite_rules();
-                $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));
-                $this->rules = apply_filters('rewrite_rules_array', $this->rules);
@@ -843 +848 @@
-        }
-
-        function wp_rewrite_rules() {
-
+//
-                if ( empty($this->rules) ) {
-                        $this->matches = 'matches';
-                        $this->rewrite_rules();
-                        update_option('rewrite_rules', $this->rules);
-                }
-
+
-                return $this->rules;
-        }
-
@@ -948 +953 @@
-                $wp->add_query_var($name);
-        }
-
+        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');
-                $this->wp_rewrite_rules();

wp-includes/classes.php

@@ -1 +1 @@
-<?php
-
-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');
-        var $extra_query_vars = array();

wp-admin/includes/media.php

@@ -1225 +1225 @@
-add_filter('media_upload_library', 'media_upload_library');
-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.')));
-*/
-
-?>