Changeset 12409

Timestamp:

12/15/2009 09:01:57 PM (15 years ago)

Author:

ryan

Message:

Remove no longer needed DB has_cap() checks. Props filosofo. fixes #11443

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -20 +20 @@
 global $wpdb, $wp_queries;
 
-if ( $wpdb->has_cap( 'collation' ) ) {
-    if ( ! empty($wpdb->charset) )
-        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-    if ( ! empty($wpdb->collate) )
-        $charset_collate .= " COLLATE $wpdb->collate";
-}
+if ( ! empty($wpdb->charset) )
+    $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+if ( ! empty($wpdb->collate) )
+    $charset_collate .= " COLLATE $wpdb->collate";
 
 /** Create WordPress database tables SQL */

trunk/wp-includes/query.php

@@ -1785 +1785 @@
 
         if ( !empty($q['category__not_in']) ) {
-            if ( $wpdb->has_cap( 'subqueries' ) ) {
-                $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
-                $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
-            } else {
-                $ids = get_objects_in_term($q['category__not_in'], 'category');
-                if ( !is_wp_error($ids) && is_array($ids) && count($ids) > 0 )
-                    $whichcat .= " AND $wpdb->posts.ID NOT IN ('" . implode("', '", $ids) . "')";
-            }
+            $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
+            $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
         }
 
@@ -1875 +1869 @@
 
         if ( !empty($q['tag__not_in']) ) {
-            if ( $wpdb->has_cap( 'subqueries' ) ) {
-                $tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
-                $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
-            } else {
-                $ids = get_objects_in_term($q['tag__not_in'], 'post_tag');
-                if ( !is_wp_error($ids) && is_array($ids) && count($ids) > 0 )
-                    $whichcat .= " AND $wpdb->posts.ID NOT IN ('" . implode("', '", $ids) . "')";
-            }
+            $tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
+            $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
         }
 

trunk/wp-includes/wp-db.php

@@ -386 +386 @@
         $this->ready = true;
 
-        if ( $this->has_cap( 'collation' ) ) {
-            if ( !empty($this->charset) ) {
-                if ( function_exists('mysql_set_charset') ) {
-                    mysql_set_charset($this->charset, $this->dbh);
-                    $this->real_escape = true;
-                } else {
-                    $collation_query = "SET NAMES '{$this->charset}'";
-                    if ( !empty($this->collate) )
-                        $collation_query .= " COLLATE '{$this->collate}'";
-                    $this->query($collation_query);
-                }
+        if ( !empty($this->charset) ) {
+            if ( function_exists('mysql_set_charset') ) {
+                mysql_set_charset($this->charset, $this->dbh);
+                $this->real_escape = true;
+            } else {
+                $collation_query = "SET NAMES '{$this->charset}'";
+                if ( !empty($this->collate) )
+                    $collation_query .= " COLLATE '{$this->collate}'";
+                $this->query($collation_query);
             }
         }