Changeset 8559

Timestamp:

08/05/2008 10:05:53 PM (16 years ago)

Author:

ryan

Message:

Check both slug and name when determining if is_term(). fixes #6593 for 2.6

Location:

branches/2.6

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

branches/2.6/wp-admin/includes/schema.php

@@ -20 +20 @@
  term_group bigint(10) NOT NULL default 0,
  PRIMARY KEY  (term_id),
- UNIQUE KEY slug (slug)
+ UNIQUE KEY slug (slug),
+ KEY name (name)
 ) $charset_collate;
 CREATE TABLE $wpdb->term_taxonomy (

branches/2.6/wp-includes/query.php

@@ -1124 +1124 @@
             $include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
             $whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
-            $reqtag = is_term( $q['tag_slug__in'][0], 'post_tag' );
+            $reqtag = get_term_by( 'slug', $q['tag_slug__in'][0], 'post_tag' );
             if ( !empty($reqtag) )
-                $q['tag_id'] = $reqtag['term_id'];
+                $q['tag_id'] = $reqtag->term_id;
         }
 

branches/2.6/wp-includes/taxonomy.php

@@ -762 +762 @@
     global $wpdb;
 
+    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
+    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
+
     if ( is_int($term) ) {
         if ( 0 == $term )
             return 0;
         $where = 't.term_id = %d';
-    } else {
-        if ( '' === $term = sanitize_title($term) )
-            return 0;
-        $where = 't.slug = %s';
-    }
-
-    if ( !empty($taxonomy) )
-        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
-
-    return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $term) );
+        if ( !empty($taxonomy) )
+            return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+        else
+            return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+    }
+
+    if ( '' === $slug = sanitize_title($term) )
+        return 0;
+
+    $where = 't.slug = %s';
+    $else_where = 't.name = %s';
+
+    if ( !empty($taxonomy) ) {
+        if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $slug, $taxonomy), ARRAY_A) )
+            return $result;
+            
+        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
+    }
+
+    if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $slug) ) )
+        return $result;
+
+    return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $term) );
 }