Changeset 7520

Timestamp:

03/26/08 06:37:19 (4 months ago)

Author:

ryan

Message:

Taxonomy links and template tags from andy. see #6357

Files:

• trunk/wp-admin/includes/media.php (modified) (1 diff)
• trunk/wp-content/themes/default/image.php (modified) (1 diff)
• trunk/wp-includes/category-template.php (modified) (2 diffs)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/media.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (3 diffs)
• trunk/wp-includes/rewrite.php (modified) (3 diffs)
• trunk/wp-includes/taxonomy.php (modified) (9 diffs)

trunk/wp-admin/includes/media.php

@@ -425 +425 @@
-
-    return wp_iframe( 'media_upload_library_form', $errors );
-}
-
-function get_attachment_taxonomies($attachment) {
-    if ( is_int( $attachment ) )
-        $attachment = get_post($attachment);
-    else if ( is_array($attachment) )
-        $attachment = (object) $attachment;
-
-    if ( ! is_object($attachment) )
-        return array();
-
-    $filename = basename($attachment->guid);
-
-    $objects = array('attachment');
-
-    if ( false !== strpos($filename, '.') )
-        $objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
-    if ( !empty($attachment->post_mime_type) ) {
-        $objects[] = 'attachment:' . $attachment->post_mime_type;
-        if ( false !== strpos($attachment->post_mime_type, '/') )
-            foreach ( explode('/', $attachment->post_mime_type) as $token )
-                if ( !empty($token) )
-                    $objects[] = "attachment:$token";
-    }
-
-    $taxonomies = array();
-    foreach ( $objects as $object )
-        if ( $taxes = get_object_taxonomies($object) )
-            $taxonomies = array_merge($taxonomies, $taxes);
-
-    return array_unique($taxonomies);
-}
-

trunk/wp-content/themes/default/image.php

@@ -24 +24 @@
-                        This entry was posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
-                        and is filed under <?php the_category(', ') ?>.
+                        <?php the_taxonomies(); ?>
-                        You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
-

trunk/wp-includes/category-template.php

@@ -476 +476 @@
-
-function get_the_tags( $id = 0 ) {
+    return apply_filters( 'get_the_tags', get_the_terms($id, 'post_tag') );
+}
+
+function get_the_tag_list( $before = '', $sep = '', $after = '' ) {
+    return apply_filters( 'the_tags', get_the_term_list(0, 'post_tag', $before, $sep, $after) );
+}
+
+function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
+    return the_terms( 0, 'post_tag', $before, $sep, $after );
+}
+
+function get_the_terms( $id = 0, $taxonomy ) {
-    global $post;
-
@@ -486 +498 @@
-        $id = (int) $post->ID;
-
-
-
-
-
-
-
+
+
+
+
+
-        return false;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        return false;
-
-
-
-
+
+
-        if ( is_wp_error( $link ) )
-            return $link;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    if ( is_wp_error( $return ) )
-        return false;

trunk/wp-includes/classes.php

@@ -15 +15 @@
-
-    function add_query_var($qv) {
-
+
+
-    }
-

trunk/wp-includes/formatting.php

@@ -1377 +1377 @@
-    $result = array_shift($args);
-    if ( count($args) == 1 )
-
+only_
-    // Loop when more than two args
-    while ( count($args) ) {

trunk/wp-includes/media.php

@@ -439 +439 @@
-}
-
+function get_attachment_taxonomies($attachment) {
+    if ( is_int( $attachment ) )
+        $attachment = get_post($attachment);
+    else if ( is_array($attachment) )
+        $attachment = (object) $attachment;
+
+    if ( ! is_object($attachment) )
+        return array();
+
+    $filename = basename($attachment->guid);
+
+    $objects = array('attachment');
+
+    if ( false !== strpos($filename, '.') )
+        $objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+    if ( !empty($attachment->post_mime_type) ) {
+        $objects[] = 'attachment:' . $attachment->post_mime_type;
+        if ( false !== strpos($attachment->post_mime_type, '/') )
+            foreach ( explode('/', $attachment->post_mime_type) as $token )
+                if ( !empty($token) )
+                    $objects[] = "attachment:$token";
+    }
+
+    $taxonomies = array();
+    foreach ( $objects as $object )
+        if ( $taxes = get_object_taxonomies($object) )
+            $taxonomies = array_merge($taxonomies, $taxes);
+
+    return array_unique($taxonomies);
+}
+
-?>

trunk/wp-includes/query.php

@@ -681 +681 @@
-            if ( empty($qv['taxonomy']) || empty($qv['term']) ) {
-                $this->is_tax = false;
+                foreach ( $GLOBALS['wp_taxonomies'] as $t ) {
+                    if ( isset($t->query_var) && '' != $qv[$t->query_var] ) {
+                        $this->is_tax = true;
+                        break;
+                    }
+                }
-            } else {
-                $this->is_tax = true;
@@ -1147 +1153 @@
-        // Taxonomies
-        if ( $this->is_tax ) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            } else {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -1297 +1318 @@
-            }
-            if ( $post_status_join ) {
-INNER
+LEFT
-                foreach ( $statuswheres as $index => $statuswhere )
-                    $statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";

trunk/wp-includes/rewrite.php

@@ -462 +462 @@
-    }
-
+    function get_extra_permastruct($name) {
+        if ( isset($this->extra_permastructs[$name]) )
+            return $this->extra_permastructs[$name];
+        return false;
+    }
+
-    function get_author_permastruct() {
-        if (isset($this->author_structure)) {
@@ -833 +839 @@
-
-        // Extra permastructs
-        $extra_rewrite = array();
-        foreach ( $this->extra_permastructs as $permastruct )
-extra_rewrite = array_merge($extra_rewrite
+this->extra_rules_top = array_merge($this->extra_rules_top
-
-        // Put them together.
-        if ( $this->use_verbose_page_rules )
-extra_rewrite, $
+
-        else
-extra_rewrite, $
+
-
-        do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -955 +960 @@
-    }
-
-
+name, $
-        if ( $with_front )
-            $struct = $this->front . $struct;
-
+$name
-    }
-

trunk/wp-includes/taxonomy.php

@@ -35 +35 @@
- * @uses $wp_taxonomies
- *
- $object_type Name of the type of taxonomy object
+|object $object Name of the type of taxonomy object, or an object (row from posts)
- * @return array The names of all taxonomy of $object_type.
- */
-_type
+
-    global $wp_taxonomies;
+
+    if ( is_object($object) ) {
+        if ( $object->post_type == 'attachment' )
+            return get_attachment_taxonomies($object);
+        $object = $object->post_type;
+    }
+
+    $object = (array) $object;
-
-    $taxonomies = array();
-    foreach ( $wp_taxonomies as $taxonomy ) {
-in_array($object_type
+array_intersect($object
-            $taxonomies[] = $taxonomy->name;
-    }
@@ -120 +128 @@
-
-/**
-
+ Do not use before init.
- *
- * A simple function for creating or modifying a taxonomy object based on the parameters given.
@@ -126 +134 @@
- * taxonomy name and another string for the object type.
- *
- * The function keeps a default set, allowing for the $args to be optional but allow the other
- * functions to still work. It is possible to overwrite the default set, which contains two
- * keys: hierarchical and update_count_callback.
- *
- * Nothing is returned, so expect error maybe or use is_taxonomy() to check whether taxonomy exists.
- *
@@ -135 +139 @@
- * hierarachical - has some defined purpose at other parts of the API and is a boolean value.
- * update_count_callback - works much like a hook, in that it will be called when the count is updated.
+ * rewrite - false to prevent rewrite, or array('slug'=>$slug) to customize permastruct; default will use $taxonomy as slug
+ * query_var - false to prevent queries, or string to customize query var (?$query_var=$term); default will use $taxonomy as query var
- *
- * @package WordPress
@@ -140 +146 @@
- * @since 2.3
- * @uses $wp_taxonomies Inserts new taxonomy object into the list
+ * @uses $wp_rewrite Adds rewrite tags and permastructs
+ * @uses $wp Adds query vars
- *
- * @param string $taxonomy Name of taxonomy object
@@ -146 +154 @@
- */
-function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
-
-
-
+, $wp
+
+, 'rewrite' => true, 'query_var' => true
-    $args = wp_parse_args($args, $defaults);
-
-
+
+
+
+
+
+
+
+
-        if ( !is_array($args['rewrite']) )
-            $args['rewrite'] = array();
-        if ( !isset($args['rewrite']['slug']) )
-            $args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
-"taxonomy=$taxonomy&term=
-
+$args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=$term
+$taxonomy, 
-    }
-
@@ -1037 +1052 @@
-    $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all');
-    $args = wp_parse_args( $args, $defaults );
+
+    $terms = array();
+    if ( count($taxonomies) > 1 ) {
+        foreach ( $taxonomies as $index => $taxonomy ) {
+            $t = get_taxonomy($taxonomy);
+            if ( is_array($t->args) && $args != array_merge($args, $t->args) ) {
+                unset($taxonomies[$index]);
+                $terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
+            }
+        }
+    } else {
+        $t = get_taxonomy($taxonomies[0]);
+        if ( is_array($t->args) )
+            $args = array_merge($args, $t->args);
+    }
+
-    extract($args, EXTR_SKIP);
-
@@ -1068 +1099 @@
-
-    if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
-$wpdb->get_results($query
+array_merge($terms, $wpdb->get_results($query)
-        update_term_cache($terms);
-    } else if ( 'ids' == $fields || 'names' == $fields ) {
-$wpdb->get_col($query
+array_merge($terms, $wpdb->get_col($query)
-    } else if ( 'tt_ids' == $fields ) {
-        $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) ORDER BY tr.term_taxonomy_id $order");
@@ -1900 +1931 @@
-}
-
+/**
+ * get_term_link() - Generates a permalink for a taxonomy term archive
+ *
+ * @param object|int|string $term
+ * @param string $taxonomy
+ * @return string HTML link to taxonomy term archive
+ */
+function get_term_link( $term, $taxonomy ) {
+    global $wp_rewrite;
+
+    $termlink = $wp_rewrite->get_extra_permastruct($taxonomy);
+
+    if ( !is_object($term) ) {
+        if ( is_int($term) ) {
+            $term = &get_term($term, $taxonomy);
+        } else {
+            $term = &get_term_by('slug', $term, $taxonomy);
+        }
+    }
+    if ( is_wp_error( $term ) )
+        return $term;
+
+    $slug = $term->slug;
+
+    if ( empty($termlink) ) {
+        $file = get_option('home') . '/';
+        $t = get_taxonomy($taxonomy);
+        if ( $t->query_var )
+            $termlink = "$file?$t->query_var=$slug";
+        else
+            $termlink = "$file?taxonomy=$taxonomy&term=$slug";
+    } else {
+        $termlink = str_replace("%$taxonomy%", $slug, $termlink);
+        $termlink = get_option('home') . user_trailingslashit($termlink, 'category');
+    }
+    return apply_filters('term_link', $termlink, $term, $taxonomy);
+}
+
+function the_taxonomies($args = array()) {
+    $defaults = array(
+        'post' => 0,
+        'before' => '',
+        'sep' => ' ',
+        'after' => '',
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    echo $before . join($sep, get_the_taxonomies($post)) . $after;
+}
+
+function get_the_taxonomies($post = 0) {
+    if ( is_int($post) )
+        $post =& get_post($post);
+    elseif ( !is_object($post) )
+        $post =& $GLOBALS['post'];
+
+    $taxonomies = array();
+
+    if ( !$post )
+        return $taxonomies;
+
+    $_template = '%s: %l.';
+
+    foreach ( get_object_taxonomies($post) as $taxonomy ) {
+        $t = (array) get_taxonomy($taxonomy);
+        if ( empty($t['label']) )
+            $t['label'] = $taxonomy;
+        if ( empty($t['args']) )
+            $t['args'] = array();
+        if ( empty($t['template']) )
+            $t['template'] = $_template;
+
+        $terms = get_object_term_cache($post->ID, $taxonomy);
+        if ( empty($terms) )
+            $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+
+        $links = array();
+
+        foreach ( $terms as $term )
+            $links[] = "<a href='" . attribute_escape(get_term_link($term, $taxonomy)) . "'>$term->name</a>";
+
+        if ( $links )
+            $taxonomies[$taxonomy] = wp_sprintf($t['template'], $t['label'], $links, $terms);
+    }
+    return $taxonomies;
+}
+
+function get_post_taxonomies($post = 0) {
+    $post =& get_post($post);
+
+    return get_object_taxonomies($post);
+}
+
-?>