Changes in trunk/wp-includes/taxonomy.php [15220:14934]

File:

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

trunk/wp-includes/taxonomy.php

@@ -46 +46 @@
         'show_ui' => false,
         '_builtin' => true,
-        'show_in_nav_menus' => false,
     ) ) ;
 
@@ -143 +142 @@
  *
  * @uses $wp_taxonomies
- * @uses taxonomy_exists() Checks whether taxonomy exists
+ * @uses is_taxonomy() Checks whether taxonomy exists
  *
  * @param string $taxonomy Name of taxonomy object to return
@@ -151 +150 @@
     global $wp_taxonomies;
 
-    if ( ! taxonomy_exists( $taxonomy ) )
+    if ( ! is_taxonomy($taxonomy) )
         return false;
 
@@ -160 +159 @@
  * Checks that the taxonomy name exists.
  *
- * Formerly is_taxonomy(), introduced in 2.3.0.
- *
- * @package WordPress
- * @subpackage Taxonomy
- * @since 3.0.0
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 2.3.0
  *
  * @uses $wp_taxonomies
@@ -171 +168 @@
  * @return bool Whether the taxonomy exists.
  */
-function taxonomy_exists( $taxonomy ) {
+function is_taxonomy( $taxonomy ) {
     global $wp_taxonomies;
 
-    return isset( $wp_taxonomies[$taxonomy] );
+    return isset($wp_taxonomies[$taxonomy]);
 }
 
@@ -189 +186 @@
  * @since 2.3.0
  *
- * @uses taxonomy_exists() Checks whether taxonomy exists
+ * @uses is_taxonomy() Checks whether taxonomy exists
  * @uses get_taxonomy() Used to get the taxonomy object
  *
@@ -196 +193 @@
  */
 function is_taxonomy_hierarchical($taxonomy) {
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return false;
 
@@ -211 +208 @@
  * the object type.
  *
- * Nothing is returned, so expect error maybe or use taxonomy_exists() to check
+ * Nothing is returned, so expect error maybe or use is_taxonomy() to check
  * whether taxonomy exists.
  *
@@ -235 +232 @@
  * show_ui - If the WordPress UI admin tags UI should apply to this taxonomy;
  * defaults to public.
- *
- * show_in_nav_menus - true makes this taxonomy available for selection in navigation menus.
- * Defaults to public.
  *
  * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
@@ -271 +265 @@
                         'labels' => array(),
                         'capabilities' => array(),
-                        'show_in_nav_menus' => null,
                     );
     $args = wp_parse_args($args, $defaults);
@@ -293 +286 @@
     if ( is_null($args['show_ui']) )
         $args['show_ui'] = $args['public'];
-
-    // Whether to show this type in nav-menus.php. Defaults to the setting for public.
-    if ( null === $args['show_in_nav_menus'] )
-        $args['show_in_nav_menus'] = $args['public'];
 
     if ( is_null($args['show_tagcloud']) )
@@ -329 +318 @@
  * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
  * - search_items - Default is Search Tags/Search Categories
- * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags
+ * - popular_items - Default is Popular Tags/Popular Categories
  * - all_items - Default is All Tags/All Categories
  * - parent_item - This string isn't used on non-hierarchical taxonomies. In hierarchical ones the default is Parent Category
@@ -337 +326 @@
  * - add_new_item - Default is Add New Tag/Add New Category
  * - new_item_name - Default is New Tag Name/New Category Name
- * - separate_items_with_commas - This string isn't used on hierarchical taxonomies. Default is "Separate tags with commas," used in the meta box.
- * - add_or_remove_items - This string isn't used on hierarchical taxonomies. Default is "Add or remove tags," used in the meta box when JavaScript is disabled.
- * - choose_from_most_used - This string isn't used on hierarchical taxonomies. Default is "Choose from the most used tags," used in the meta box.
  *
  * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories.)
@@ -349 +335 @@
 
 function get_taxonomy_labels( $tax ) {
-    if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
-        $tax->labels['separate_items_with_commas'] = $tax->helps;
-
     $nohier_vs_hier_defaults = array(
         'name' => array( _x( 'Post Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
         'singular_name' => array( _x( 'Post Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
         'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
-        'popular_items' => array( __( 'Popular Tags' ), null ),
+        'popular_items' => array( __( 'Popular Tags' ), __( 'Popular Category' ) ),
         'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
         'parent_item' => array( null, __( 'Parent Category' ) ),
@@ -364 +347 @@
         'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
         'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
-        'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
-        'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
-        'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
     );
 
@@ -440 +420 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! taxonomy_exists( $taxonomy ) )
+        if ( ! is_taxonomy( $taxonomy ) )
             return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
     }
@@ -512 +492 @@
     }
 
-    if ( ! taxonomy_exists($taxonomy) ) {
+    if ( ! is_taxonomy($taxonomy) ) {
         $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
         return $error;
@@ -579 +559 @@
     global $wpdb;
 
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return false;
 
@@ -637 +617 @@
  */
 function get_term_children( $term_id, $taxonomy ) {
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
 
@@ -822 +802 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! taxonomy_exists($taxonomy) ) {
+        if ( ! is_taxonomy($taxonomy) ) {
             $error = & new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
             return $error;
@@ -1074 +1054 @@
  * Returns the index of a defined term, or 0 (false) if the term doesn't exist.
  *
- * Formerly is_term(), introduced in 2.3.0.
- *
- * @package WordPress
- * @subpackage Taxonomy
- * @since 3.0.0
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 2.3.0
  *
  * @uses $wpdb
@@ -1087 +1065 @@
  * @return mixed Get the term id or Term Object, if exists.
  */
-function term_exists($term, $taxonomy = '', $parent = 0) {
+function is_term($term, $taxonomy = '', $parent = 0) {
     global $wpdb;
 
@@ -1348 +1326 @@
     $term = (int) $term;
 
-    if ( ! $ids = term_exists($term, $taxonomy) )
+    if ( ! $ids = is_term($term, $taxonomy) )
         return false;
     if ( is_wp_error( $ids ) )
@@ -1361 +1339 @@
     if ( isset($default) ) {
         $default = (int) $default;
-        if ( ! term_exists($default, $taxonomy) )
+        if ( ! is_term($default, $taxonomy) )
             unset($default);
     }
@@ -1448 +1426 @@
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! taxonomy_exists($taxonomy) )
+        if ( ! is_taxonomy($taxonomy) )
             return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
     }
@@ -1586 +1564 @@
     global $wpdb;
 
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
@@ -1628 +1606 @@
     }
 
-    if ( $term_id = term_exists($slug) ) {
+    if ( $term_id = is_term($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 && term_exists( (int) $term_id, $taxonomy ) ) {
+        if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && is_term( (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) );
@@ -1648 +1626 @@
                 return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
             $term_id = (int) $wpdb->insert_id;
-        } elseif ( term_exists( (int) $term_id, $taxonomy ) )  {
+        } elseif ( is_term( (int) $term_id, $taxonomy ) )  {
             // Same name, same slug.
             return new WP_Error('term_exists', __('A term with the name provided already exists.'));
@@ -1717 +1695 @@
     $object_id = (int) $object_id;
 
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
 
@@ -1735 +1713 @@
             continue;
 
-        if ( !$term_info = term_exists($term, $taxonomy) ) {
+        if ( !$term_info = is_term($term, $taxonomy) ) {
             // Skip if a non-existent term ID is passed.
             if ( is_int($term) )
@@ -1810 +1788 @@
     global $wpdb;
 
-    if ( ! term_exists( $slug ) )
+    if ( ! is_term( $slug ) )
         return $slug;
 
@@ -1822 +1800 @@
                 break;
             $slug .= '-' . $parent_term->slug;
-            if ( ! term_exists( $slug ) )
+            if ( ! is_term( $slug ) )
                 return $slug;
 
@@ -1888 +1866 @@
     global $wpdb;
 
-    if ( ! taxonomy_exists($taxonomy) )
+    if ( ! is_taxonomy($taxonomy) )
         return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
@@ -2407 +2385 @@
 
     // Get the object and term ids and stick them in a lookup table
-    $tax_obj = get_taxonomy($taxonomy);
-    $object_types = esc_sql($tax_obj->object_type);
-    $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
+    $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (".join(',', array_keys($term_ids)).") AND post_type = 'post' AND post_status = 'publish'");
     foreach ( $results as $row ) {
         $id = $term_ids[$row->term_taxonomy_id];