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

Timestamp:

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

Author:

ryan

Message:

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

File:

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

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'));