Ticket #13747: 13747.2.diff
File 13747.2.diff, 13.7 KB (added by , 14 years ago) |
---|
-
wp-includes/taxonomy.php
142 142 * @since 2.3.0 143 143 * 144 144 * @uses $wp_taxonomies 145 * @uses is_taxonomy() Checks whether taxonomy exists145 * @uses taxonomy_exists() Checks whether taxonomy exists 146 146 * 147 147 * @param string $taxonomy Name of taxonomy object to return 148 148 * @return object|bool The Taxonomy Object or false if $taxonomy doesn't exist … … 150 150 function get_taxonomy( $taxonomy ) { 151 151 global $wp_taxonomies; 152 152 153 if ( ! is_taxonomy($taxonomy) )153 if ( ! taxonomy_exists( $taxonomy ) ) 154 154 return false; 155 155 156 156 return $wp_taxonomies[$taxonomy]; … … 159 159 /** 160 160 * Checks that the taxonomy name exists. 161 161 * 162 * Formerly is_taxonomy(), introduced in 2.3.0. 163 * 162 164 * @package WordPress 163 165 * @subpackage Taxonomy 164 * @since 2.3.0166 * @since 3.0.0 165 167 * 166 168 * @uses $wp_taxonomies 167 169 * 168 170 * @param string $taxonomy Name of taxonomy object 169 171 * @return bool Whether the taxonomy exists. 170 172 */ 171 function is_taxonomy( $taxonomy ) {173 function taxonomy_exists( $taxonomy ) { 172 174 global $wp_taxonomies; 173 175 174 return isset( $wp_taxonomies[$taxonomy]);176 return isset( $wp_taxonomies[$taxonomy] ); 175 177 } 176 178 177 179 /** … … 186 188 * @subpackage Taxonomy 187 189 * @since 2.3.0 188 190 * 189 * @uses is_taxonomy() Checks whether taxonomy exists191 * @uses taxonomy_exists() Checks whether taxonomy exists 190 192 * @uses get_taxonomy() Used to get the taxonomy object 191 193 * 192 194 * @param string $taxonomy Name of taxonomy object 193 195 * @return bool Whether the taxonomy is hierarchical 194 196 */ 195 197 function is_taxonomy_hierarchical($taxonomy) { 196 if ( ! is_taxonomy($taxonomy) )198 if ( ! taxonomy_exists($taxonomy) ) 197 199 return false; 198 200 199 201 $taxonomy = get_taxonomy($taxonomy); … … 208 210 * parameter), along with strings for the taxonomy name and another string for 209 211 * the object type. 210 212 * 211 * Nothing is returned, so expect error maybe or use is_taxonomy() to check213 * Nothing is returned, so expect error maybe or use taxonomy_exists() to check 212 214 * whether taxonomy exists. 213 215 * 214 216 * Optional $args contents: … … 437 439 $taxonomies = array( $taxonomies ); 438 440 439 441 foreach ( (array) $taxonomies as $taxonomy ) { 440 if ( ! is_taxonomy( $taxonomy ) )442 if ( ! taxonomy_exists( $taxonomy ) ) 441 443 return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) ); 442 444 } 443 445 … … 509 511 return $error; 510 512 } 511 513 512 if ( ! is_taxonomy($taxonomy) ) {514 if ( ! taxonomy_exists($taxonomy) ) { 513 515 $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); 514 516 return $error; 515 517 } … … 576 578 function get_term_by($field, $value, $taxonomy, $output = OBJECT, $filter = 'raw') { 577 579 global $wpdb; 578 580 579 if ( ! is_taxonomy($taxonomy) )581 if ( ! taxonomy_exists($taxonomy) ) 580 582 return false; 581 583 582 584 if ( 'slug' == $field ) { … … 634 636 * @return array|WP_Error List of Term Objects. WP_Error returned if $taxonomy does not exist 635 637 */ 636 638 function get_term_children( $term_id, $taxonomy ) { 637 if ( ! is_taxonomy($taxonomy) )639 if ( ! taxonomy_exists($taxonomy) ) 638 640 return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); 639 641 640 642 $term_id = intval( $term_id ); … … 819 821 } 820 822 821 823 foreach ( (array) $taxonomies as $taxonomy ) { 822 if ( ! is_taxonomy($taxonomy) ) {824 if ( ! taxonomy_exists($taxonomy) ) { 823 825 $error = & new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); 824 826 return $error; 825 827 } … … 1071 1073 * 1072 1074 * Returns the index of a defined term, or 0 (false) if the term doesn't exist. 1073 1075 * 1076 * Formerly is_term(), introduced in 2.3.0. 1077 * 1074 1078 * @package WordPress 1075 1079 * @subpackage Taxonomy 1076 * @since 2.3.01080 * @since 3.0.0 1077 1081 * 1078 1082 * @uses $wpdb 1079 1083 * … … 1082 1086 * @param int $parent ID of parent term under which to confine the exists search. 1083 1087 * @return mixed Get the term id or Term Object, if exists. 1084 1088 */ 1085 function is_term($term, $taxonomy = '', $parent = 0) {1089 function term_exists($term, $taxonomy = '', $parent = 0) { 1086 1090 global $wpdb; 1087 1091 1088 1092 $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; … … 1343 1347 1344 1348 $term = (int) $term; 1345 1349 1346 if ( ! $ids = is_term($term, $taxonomy) )1350 if ( ! $ids = term_exists($term, $taxonomy) ) 1347 1351 return false; 1348 1352 if ( is_wp_error( $ids ) ) 1349 1353 return $ids; … … 1356 1360 1357 1361 if ( isset($default) ) { 1358 1362 $default = (int) $default; 1359 if ( ! is_term($default, $taxonomy) )1363 if ( ! term_exists($default, $taxonomy) ) 1360 1364 unset($default); 1361 1365 } 1362 1366 … … 1443 1447 $taxonomies = array($taxonomies); 1444 1448 1445 1449 foreach ( (array) $taxonomies as $taxonomy ) { 1446 if ( ! is_taxonomy($taxonomy) )1450 if ( ! taxonomy_exists($taxonomy) ) 1447 1451 return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); 1448 1452 } 1449 1453 … … 1581 1585 function wp_insert_term( $term, $taxonomy, $args = array() ) { 1582 1586 global $wpdb; 1583 1587 1584 if ( ! is_taxonomy($taxonomy) )1588 if ( ! taxonomy_exists($taxonomy) ) 1585 1589 return new WP_Error('invalid_taxonomy', __('Invalid taxonomy')); 1586 1590 1587 1591 $term = apply_filters( 'pre_insert_term', $term, $taxonomy ); … … 1623 1627 } 1624 1628 } 1625 1629 1626 if ( $term_id = is_term($slug) ) {1630 if ( $term_id = term_exists($slug) ) { 1627 1631 $existing_term = $wpdb->get_row( $wpdb->prepare( "SELECT name FROM $wpdb->terms WHERE term_id = %d", $term_id), ARRAY_A ); 1628 1632 // We've got an existing term in the same taxonomy, which matches the name of the new term: 1629 if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && is_term( (int) $term_id, $taxonomy ) ) {1633 if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && term_exists( (int) $term_id, $taxonomy ) ) { 1630 1634 // Hierarchical, and it matches an existing term, Do not allow same "name" in the same level. 1631 1635 $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => (int)$parent) ); 1632 1636 if ( in_array($name, $siblings) ) { … … 1643 1647 if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) 1644 1648 return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error); 1645 1649 $term_id = (int) $wpdb->insert_id; 1646 } elseif ( is_term( (int) $term_id, $taxonomy ) ) {1650 } elseif ( term_exists( (int) $term_id, $taxonomy ) ) { 1647 1651 // Same name, same slug. 1648 1652 return new WP_Error('term_exists', __('A term with the name provided already exists.')); 1649 1653 } … … 1712 1716 1713 1717 $object_id = (int) $object_id; 1714 1718 1715 if ( ! is_taxonomy($taxonomy) )1719 if ( ! taxonomy_exists($taxonomy) ) 1716 1720 return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); 1717 1721 1718 1722 if ( !is_array($terms) ) … … 1730 1734 if ( !strlen(trim($term)) ) 1731 1735 continue; 1732 1736 1733 if ( !$term_info = is_term($term, $taxonomy) ) {1737 if ( !$term_info = term_exists($term, $taxonomy) ) { 1734 1738 // Skip if a non-existent term ID is passed. 1735 1739 if ( is_int($term) ) 1736 1740 continue; … … 1805 1809 function wp_unique_term_slug($slug, $term) { 1806 1810 global $wpdb; 1807 1811 1808 if ( ! is_term( $slug ) )1812 if ( ! term_exists( $slug ) ) 1809 1813 return $slug; 1810 1814 1811 1815 // If the taxonomy supports hierarchy and the term has a parent, make the slug unique … … 1817 1821 if ( is_wp_error($parent_term) || empty($parent_term) ) 1818 1822 break; 1819 1823 $slug .= '-' . $parent_term->slug; 1820 if ( ! is_term( $slug ) )1824 if ( ! term_exists( $slug ) ) 1821 1825 return $slug; 1822 1826 1823 1827 if ( empty($parent_term->parent) ) … … 1883 1887 function wp_update_term( $term_id, $taxonomy, $args = array() ) { 1884 1888 global $wpdb; 1885 1889 1886 if ( ! is_taxonomy($taxonomy) )1890 if ( ! taxonomy_exists($taxonomy) ) 1887 1891 return new WP_Error('invalid_taxonomy', __('Invalid taxonomy')); 1888 1892 1889 1893 $term_id = (int) $term_id; -
wp-includes/post.php
673 673 * @return bool Whether post type is hierarchical. 674 674 */ 675 675 function is_post_type_hierarchical( $post_type ) { 676 if ( ! is_post_type( $post_type ) )676 if ( ! post_type_exists( $post_type ) ) 677 677 return false; 678 678 679 679 $post_type = get_post_type_object( $post_type ); … … 684 684 * Checks if a post type is registered. 685 685 * 686 686 * @since 3.0.0 687 * @uses get_post_type ()687 * @uses get_post_type_object() 688 688 * 689 689 * @param string Post type name 690 690 * @return bool Whether post type is registered. 691 691 */ 692 function is_post_type( $post_type ) {692 function post_type_exists( $post_type ) { 693 693 return (bool) get_post_type_object( $post_type ); 694 694 } 695 695 -
wp-includes/default-widgets.php
1041 1041 } 1042 1042 1043 1043 function _get_current_taxonomy($instance) { 1044 if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )1044 if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) ) 1045 1045 return $instance['taxonomy']; 1046 1046 1047 1047 return 'post_tag'; -
wp-includes/deprecated.php
2513 2513 _deprecated_function( __FUNCTION__, '3.0' ); 2514 2514 return ''; 2515 2515 } 2516 2517 /** 2518 * Checks if a post type is registered. 2519 * 2520 * @since 3.0.0 2521 * @deprecated 3.0.0 2522 * @deprecated Use post_type_exists() 2523 * @see post_type_exists() 2524 * 2525 * @param string Post type name 2526 * @return bool Whether post type is registered. 2527 */ 2528 function is_post_type( $post_type ) { 2529 _deprecated_function( __FUNCTION__, '3.0', 'post_type_exists()' ); 2530 return post_type_exists( $post_type ); 2531 } 2532 2533 /** 2534 * Checks that the taxonomy name exists. 2535 * 2536 * @since 2.3.0 2537 * @deprecated 3.0.0 2538 * @deprecated Use taxonomy_exists() 2539 * @see taxonomy_exists() 2540 * 2541 * @param string $taxonomy Name of taxonomy object 2542 * @return bool Whether the taxonomy exists. 2543 */ 2544 function is_taxonomy( $taxonomy ) { 2545 _deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' ); 2546 return taxonomy_exists( $post_type ); 2547 } 2548 2549 /** 2550 * Check if Term exists. 2551 * 2552 * @since 2.3.0 2553 * @deprecated 3.0.0 2554 * @deprecated Use term_exists() 2555 * @see term_exists() 2556 * 2557 * @param int|string $term The term to check 2558 * @param string $taxonomy The taxonomy name to use 2559 * @param int $parent ID of parent term under which to confine the exists search. 2560 * @return mixed Get the term id or Term Object, if exists. 2561 */ 2562 function is_term( $term, $taxonomy = '', $parent = 0 ) { 2563 _deprecated_function( __FUNCTION__, '3.0', 'term_exists()' ); 2564 return term_exists( $term, $taxonomy, $parent ); 2565 } 2566 No newline at end of file -
wp-includes/category-template.php
482 482 483 483 extract( $r ); 484 484 485 if ( ! is_taxonomy($taxonomy) )485 if ( !taxonomy_exists($taxonomy) ) 486 486 return false; 487 487 488 488 $categories = get_categories( $r ); -
wp-admin/admin-ajax.php
237 237 $category_nicename = sanitize_title($cat_name); 238 238 if ( '' === $category_nicename ) 239 239 continue; 240 if ( !($cat_id = is_term($cat_name, $taxonomy->name, $parent)) ) {240 if ( !($cat_id = term_exists($cat_name, $taxonomy->name, $parent)) ) { 241 241 $new_term = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent)); 242 242 $cat_id = $new_term['term_id']; 243 243 } … … 501 501 $slug = sanitize_title($cat_name); 502 502 if ( '' === $slug ) 503 503 continue; 504 if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {504 if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) { 505 505 $cat_id = wp_insert_term( $cat_name, 'link_category' ); 506 506 } 507 507 $cat_id = $cat_id['term_id']; -
wp-admin/includes/taxonomy.php
19 19 * @return unknown 20 20 */ 21 21 function category_exists($cat_name, $parent = 0) { 22 $id = is_term($cat_name, 'category', $parent);22 $id = term_exists($cat_name, 'category', $parent); 23 23 if ( is_array($id) ) 24 24 $id = $id['term_id']; 25 25 return $id; … … 240 240 * @return unknown 241 241 */ 242 242 function tag_exists($tag_name) { 243 return is_term($tag_name, 'post_tag');243 return term_exists($tag_name, 'post_tag'); 244 244 } 245 245 246 246 /** … … 264 264 * @return unknown 265 265 */ 266 266 function wp_create_term($tag_name, $taxonomy = 'post_tag') { 267 if ( $id = is_term($tag_name, $taxonomy) )267 if ( $id = term_exists($tag_name, $taxonomy) ) 268 268 return $id; 269 269 270 270 return wp_insert_term($tag_name, $taxonomy); -
wp-admin/includes/nav-menu.php
274 274 } 275 275 276 276 if ( 'get-post-item' == $type ) { 277 if ( get_post_type_object( $object_type ) ) {277 if ( post_type_exists( $object_type ) ) { 278 278 if ( isset( $request['ID'] ) ) { 279 279 $object_id = (int) $request['ID']; 280 280 if ( 'markup' == $response_format ) { … … 291 291 echo "\n"; 292 292 } 293 293 } 294 } elseif ( is_taxonomy( $object_type ) ) {294 } elseif ( taxonomy_exists( $object_type ) ) { 295 295 if ( isset( $request['ID'] ) ) { 296 296 $object_id = (int) $request['ID']; 297 297 if ( 'markup' == $response_format ) { -
wp-admin/edit-tags.php
14 14 if ( empty($taxonomy) ) 15 15 $taxonomy = 'post_tag'; 16 16 17 if ( ! is_taxonomy($taxonomy) )17 if ( !taxonomy_exists($taxonomy) ) 18 18 wp_die(__('Invalid taxonomy')); 19 19 20 20 $tax = get_taxonomy($taxonomy);