Changes from branches/4.0/src/wp-includes/link-template.php at r30405 to trunk/src/wp-includes/link-template.php at r29375

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

trunk/src/wp-includes/link-template.php

@@ -258 +258 @@
         $post_type = get_post_type_object($post->post_type);
 
-        if ( $post_type->hierarchical ) {
-                $slug = get_page_uri( $id );
-        }
-
         if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
                 if ( ! $leavename ) {
+                        if ( $post_type->hierarchical )
+                                $slug = get_page_uri($id);
                         $post_link = str_replace("%$post->post_type%", $slug, $post_link);
                 }
@@ -1514 +1512 @@
 
                 if ( ! empty( $excluded_terms ) ) {
-                        $where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( $excluded_terms, ',' ) . ') )';
+                        $where .= " AND p.ID NOT IN ( SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . implode( $excluded_terms, ',' ) . ') )';
                 }
         }