Changes in trunk/wp-includes/taxonomy.php [11971:12261]

File:

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

trunk/wp-includes/taxonomy.php

@@ -302 +302 @@
 function &get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
     global $wpdb;
+    $null = null;
 
     if ( empty($term) ) {
@@ -322 +323 @@
         if ( ! $_term = wp_cache_get($term, $taxonomy) ) {
             $_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND t.term_id = %s LIMIT 1", $taxonomy, $term) );
+            if ( ! $_term )
+                return $null;
             wp_cache_add($term, $_term, $taxonomy);
         }
@@ -1516 +1519 @@
     }
 
-    do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append);
+    do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
     return $tt_ids;
 }
@@ -1678 +1681 @@
             return new WP_Error('duplicate_term_slug', sprintf(__('The slug “%s” is already in use by another term'), $slug));
     }
-    do_action( 'edit_terms', $alias->term_id );
+    do_action( 'edit_terms', $term_id );
     $wpdb->update($wpdb->terms, compact( 'name', 'slug', 'term_group' ), compact( 'term_id' ) );
     if ( empty($slug) ) {
@@ -1684 +1687 @@
         $wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
     }
-    do_action( 'edited_terms', $alias->term_id );
+    do_action( 'edited_terms', $term_id );
 
     $tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
@@ -2214 +2217 @@
 
     if ( empty($termlink) ) {
-        $file = get_option('home') . '/';
+        $file = trailingslashit( get_option('home') );
         $t = get_taxonomy($taxonomy);
         if ( $t->query_var )