Changeset 15220

Timestamp:

06/11/2010 03:53:41 PM (14 years ago)

Author:

ryan

Message:

Deprecate is_term, is_taxonomy, is_post_type for *_exists(). Props nacin. fixes #13747

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (2 diffs)
• wp-admin/includes/taxonomy.php (modified) (3 diffs)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (25 diffs)

trunk/wp-admin/admin-ajax.php

@@ -238 +238 @@
         if ( '' === $category_nicename )
             continue;
-        if ( !($cat_id = is_term($cat_name, $taxonomy->name, $parent)) ) {
+        if ( !($cat_id = term_exists($cat_name, $taxonomy->name, $parent)) ) {
             $new_term = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
             $cat_id = $new_term['term_id'];
@@ -502 +502 @@
         if ( '' === $slug )
             continue;
-        if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
+        if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) {
             $cat_id = wp_insert_term( $cat_name, 'link_category' );
         }

trunk/wp-admin/edit-tags.php

@@ -15 +15 @@
     $taxonomy = 'post_tag';
 
-if ( !is_taxonomy($taxonomy) )
+if ( !taxonomy_exists($taxonomy) )
     wp_die(__('Invalid taxonomy'));
 

trunk/wp-admin/includes/nav-menu.php

@@ -280 +280 @@
 
     if ( 'get-post-item' == $type ) {
-        if ( get_post_type_object( $object_type ) ) {
+        if ( post_type_exists( $object_type ) ) {
             if ( isset( $request['ID'] ) ) {
                 $object_id = (int) $request['ID'];
@@ -297 +297 @@
                 }
             }
-        } elseif ( is_taxonomy( $object_type ) ) {
+        } elseif ( taxonomy_exists( $object_type ) ) {
             if ( isset( $request['ID'] ) ) {
                 $object_id = (int) $request['ID'];

trunk/wp-admin/includes/taxonomy.php

@@ -20 +20 @@
  */
 function category_exists($cat_name, $parent = 0) {
-    $id = is_term($cat_name, 'category', $parent);
+    $id = term_exists($cat_name, 'category', $parent);
     if ( is_array($id) )
         $id = $id['term_id'];
@@ -241 +241 @@
  */
 function tag_exists($tag_name) {
-    return is_term($tag_name, 'post_tag');
+    return term_exists($tag_name, 'post_tag');
 }
 
@@ -265 +265 @@
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-    if ( $id = is_term($tag_name, $taxonomy) )
+    if ( $id = term_exists($tag_name, $taxonomy) )
         return $id;
 

trunk/wp-includes/category-template.php

@@ -483 +483 @@
     extract( $r );
 
-    if ( !is_taxonomy($taxonomy) )
+    if ( !taxonomy_exists($taxonomy) )
         return false;
 

trunk/wp-includes/default-widgets.php

@@ -1042 +1042 @@
 
     function _get_current_taxonomy($instance) {
-        if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )
+        if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
             return $instance['taxonomy'];
 

trunk/wp-includes/deprecated.php

@@ -2514 +2514 @@
     return '';
 }
+
+/**
+ * Checks if a post type is registered.
+ *
+ * @since 3.0.0
+ * @deprecated 3.0.0
+ * @deprecated Use post_type_exists()
+ * @see post_type_exists()
+ *
+ * @param string Post type name
+ * @return bool Whether post type is registered.
+ */
+function is_post_type( $post_type ) {
+    _deprecated_function( __FUNCTION__, '3.0', 'post_type_exists()' );
+    return post_type_exists( $post_type );
+}
+
+/**
+ * Checks that the taxonomy name exists.
+ *
+ * @since 2.3.0
+ * @deprecated 3.0.0
+ * @deprecated Use taxonomy_exists()
+ * @see taxonomy_exists()
+ *
+ * @param string $taxonomy Name of taxonomy object
+ * @return bool Whether the taxonomy exists.
+ */
+function is_taxonomy( $taxonomy ) {
+    _deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
+    return taxonomy_exists( $post_type );
+}
+
+/**
+ * Check if Term exists.
+ *
+ * @since 2.3.0
+ * @deprecated 3.0.0
+ * @deprecated Use term_exists()
+ * @see term_exists()
+ *
+ * @param int|string $term The term to check
+ * @param string $taxonomy The taxonomy name to use
+ * @param int $parent ID of parent term under which to confine the exists search.
+ * @return mixed Get the term id or Term Object, if exists.
+ */
+function is_term( $term, $taxonomy = '', $parent = 0 ) {
+    _deprecated_function( __FUNCTION__, '3.0', 'term_exists()' );
+    return term_exists( $term, $taxonomy, $parent );
+}

trunk/wp-includes/post.php

@@ -674 +674 @@
  */
 function is_post_type_hierarchical( $post_type ) {
-    if ( ! is_post_type( $post_type ) )
+    if ( ! post_type_exists( $post_type ) )
         return false;
 
@@ -685 +685 @@
  *
  * @since 3.0.0
- * @uses get_post_type()
+ * @uses get_post_type_object()
  *
  * @param string Post type name
  * @return bool Whether post type is registered.
  */
-function is_post_type( $post_type ) {
+function post_type_exists( $post_type ) {
     return (bool) get_post_type_object( $post_type );
 }

trunk/wp-includes/taxonomy.php

@@ -143 +143 @@
  *
  * @uses $wp_taxonomies
- * @uses is_taxonomy() Checks whether taxonomy exists
+ * @uses taxonomy_exists() Checks whether taxonomy exists
  *
  * @param string $taxonomy Name of taxonomy object to return
@@ -151 +151 @@
     global $wp_taxonomies;
 
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists( $taxonomy ) )
         return false;
 
@@ -160 +160 @@
  * Checks that the taxonomy name exists.
  *
- * @package WordPress
- * @subpackage Taxonomy
- * @since 2.3.0
+ * Formerly is_taxonomy(), introduced in 2.3.0.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.0.0
  *
  * @uses $wp_taxonomies
@@ -169 +171 @@
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
+function taxonomy_exists( $taxonomy ) {
     global $wp_taxonomies;
 
-    return isset($wp_taxonomies[$taxonomy]);
+    return isset( $wp_taxonomies[$taxonomy] );
 }
 
@@ -187 +189 @@
  * @since 2.3.0
  *
- * @uses is_taxonomy() Checks whether taxonomy exists
+ * @uses taxonomy_exists() Checks whether taxonomy exists
  * @uses get_taxonomy() Used to get the taxonomy object
  *
@@ -194 +196 @@
  */
 function is_taxonomy_hierarchical($taxonomy) {
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return false;
 
@@ -209 +211 @@
  * the object type.
  *
- * Nothing is returned, so expect error maybe or use is_taxonomy() to check
+ * Nothing is returned, so expect error maybe or use taxonomy_exists() to check
  * whether taxonomy exists.
  *
@@ -438 +440 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! is_taxonomy( $taxonomy ) )
+        if ( ! taxonomy_exists( $taxonomy ) )
             return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
     }
@@ -510 +512 @@
     }
 
-    if ( ! is_taxonomy($taxonomy) ) {
+    if ( ! taxonomy_exists($taxonomy) ) {
         $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
         return $error;
@@ -577 +579 @@
     global $wpdb;
 
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return false;
 
@@ -635 +637 @@
  */
 function get_term_children( $term_id, $taxonomy ) {
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
 
@@ -820 +822 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! is_taxonomy($taxonomy) ) {
+        if ( ! taxonomy_exists($taxonomy) ) {
             $error = & new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
             return $error;
@@ -1072 +1074 @@
  * Returns the index of a defined term, or 0 (false) if the term doesn't exist.
  *
- * @package WordPress
- * @subpackage Taxonomy
- * @since 2.3.0
+ * Formerly is_term(), introduced in 2.3.0.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.0.0
  *
  * @uses $wpdb
@@ -1083 +1087 @@
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term($term, $taxonomy = '', $parent = 0) {
+function term_exists($term, $taxonomy = '', $parent = 0) {
     global $wpdb;
 
@@ -1344 +1348 @@
     $term = (int) $term;
 
-    if ( ! $ids = is_term($term, $taxonomy) )
+    if ( ! $ids = term_exists($term, $taxonomy) )
         return false;
     if ( is_wp_error( $ids ) )
@@ -1357 +1361 @@
     if ( isset($default) ) {
         $default = (int) $default;
-        if ( ! is_term($default, $taxonomy) )
+        if ( ! term_exists($default, $taxonomy) )
             unset($default);
     }
@@ -1444 +1448 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! is_taxonomy($taxonomy) )
+        if ( ! taxonomy_exists($taxonomy) )
             return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
     }
@@ -1582 +1586 @@
     global $wpdb;
 
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
@@ -1624 +1628 @@
     }
 
-    if ( $term_id = is_term($slug) ) {
+    if ( $term_id = term_exists($slug) ) {
         $existing_term = $wpdb->get_row( $wpdb->prepare( "SELECT name FROM $wpdb->terms WHERE term_id = %d", $term_id), ARRAY_A );
         // We've got an existing term in the same taxonomy, which matches the name of the new term:
-        if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && is_term( (int) $term_id, $taxonomy ) ) {
+        if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && term_exists( (int) $term_id, $taxonomy ) ) {
             // Hierarchical, and it matches an existing term, Do not allow same "name" in the same level.
             $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => (int)$parent) );
@@ -1644 +1648 @@
                 return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
             $term_id = (int) $wpdb->insert_id;
-        } elseif ( is_term( (int) $term_id, $taxonomy ) )  {
+        } elseif ( term_exists( (int) $term_id, $taxonomy ) )  {
             // Same name, same slug.
             return new WP_Error('term_exists', __('A term with the name provided already exists.'));
@@ -1713 +1717 @@
     $object_id = (int) $object_id;
 
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
 
@@ -1731 +1735 @@
             continue;
 
-        if ( !$term_info = is_term($term, $taxonomy) ) {
+        if ( !$term_info = term_exists($term, $taxonomy) ) {
             // Skip if a non-existent term ID is passed.
             if ( is_int($term) )
@@ -1806 +1810 @@
     global $wpdb;
 
-    if ( ! is_term( $slug ) )
+    if ( ! term_exists( $slug ) )
         return $slug;
 
@@ -1818 +1822 @@
                 break;
             $slug .= '-' . $parent_term->slug;
-            if ( ! is_term( $slug ) )
+            if ( ! term_exists( $slug ) )
                 return $slug;
 
@@ -1884 +1888 @@
     global $wpdb;
 
-    if ( ! is_taxonomy($taxonomy) )
+    if ( ! taxonomy_exists($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));