Changeset 12597 for trunk/wp-includes/taxonomy.php

Timestamp:

01/04/2010 04:58:43 PM (15 years ago)

Author:

ryan

Message:

More custom post type support. Props scribu. see #9674

File:

• trunk/wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-includes/taxonomy.php

@@ -181 +181 @@
     }
 
-    if ( false !== $args['rewrite'] && !empty($wp_rewrite) ) {
+    if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
         if ( !is_array($args['rewrite']) )
             $args['rewrite'] = array();
@@ -187 +187 @@
             $args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
         $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=$term");
-        $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%");
+        $wp_rewrite->add_permastruct($taxonomy, "/{$args['rewrite']['slug']}/%$taxonomy%");
     }
 
     $args['name'] = $taxonomy;
-    $args['object_type'] = $object_type;
+    $args['object_type'] = (array) $object_type;
     $wp_taxonomies[$taxonomy] = (object) $args;
+}
+
+/**
+ * Add an already registered taxonomy to an object type.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.0
+ * @uses $wp_taxonomies Modifies taxonomy object
+ *
+ * @param string $taxonomy Name of taxonomy object
+ * @param array|string $object_type Name of the object type
+ * @return bool True if successful, false if not
+ */
+function register_taxonomy_for_object_type( $taxonomy, $object_type) {
+    global $wp_taxonomies;
+
+    if ( !isset($wp_taxonomies[$taxonomy]) )
+        return false;
+
+    if ( ! get_post_type_object($object_type) )
+        return false;
+
+    $wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+
+    return true;
 }
 
@@ -2379 +2405 @@
 }
 
+/**
+ * Determine if the given object type is associated with the given taxonomy.
+ *
+ * @since 3.0
+ * @uses get_object_taxonomies()
+ *
+ * @param string $object_type Object type string
+ * @param string $taxonomy.  Single taxonomy name
+ * @return bool True if object is associated with the taxonomy, otherwise false.
+ */
+function is_object_in_taxonomy($object_type, $taxonomy) {
+    $taxonomies = get_object_taxonomies($object_type);
+
+    if ( empty($taxonomies) )
+        return false;
+
+    if ( in_array($taxonomy, $taxonomies) )
+        return true;
+
+    return false;
+}
+
 ?>