Changeset 8740

Timestamp:

08/26/2008 11:57:48 PM (15 years ago)

Author:

ryan

Message:

wpdb::has_cap() from mdawaffe. fixes #7609

Location:

trunk

Files:

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

trunk/wp-admin/includes/schema.php

@@ -7 +7 @@
 global $wpdb, $wp_queries;
 
-if ( $wpdb->supports_collation() ) {
+if ( $wpdb->has_cap( 'collation' ) ) {
     if ( ! empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";

trunk/wp-includes/query.php

@@ -1047 +1047 @@
 
         if ( !empty($q['category__not_in']) ) {
-            if ( $wpdb->supports_subqueries() ) {
+            if ( $wpdb->has_cap( 'subqueries' ) ) {
                 $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
                 $whichcat .= " AND $wpdb->posts.ID NOT IN (SELECT $wpdb->term_relationships.object_id FROM $wpdb->term_relationships WHERE $wpdb->term_relationships.term_taxonomy_id IN ($cat_string) )";

trunk/wp-includes/wp-db.php

@@ -333 +333 @@
         $this->ready = true;
 
-        if ( $this->supports_collation() ) {
+        if ( $this->has_cap( 'collation' ) ) {
             $collation_query = '';
             if ( !empty($this->charset) ) {
@@ -920 +920 @@
     function supports_collation()
     {
-        return ( version_compare($this->db_version(), '4.1.0', '>=') );
-    }
-
-    /**
-     * Whether of not the database version supports sub-queries.
-     *
-     * @since 2.7
-     *
-     * @return bool True if sub-queries are supported, false if version does not
-     */
-    function supports_subqueries() {
-        return ( version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') );
+        return $this->has_cap( 'collation' );
+    }
+
+    /**
+     * Generic function to determine if a database supports a particular feature
+     * @param string $db_cap the feature
+     * @param false|string|resource $dbh_or_table the databaese (the current database, the database housing the specified table, or the database of the mysql resource)
+     * @return bool
+     */
+    function has_cap( $db_cap ) {
+        $version = $this->db_version();
+
+        switch ( strtolower( $db_cap ) ) :
+        case 'collation' :    // @since 2.5.0
+        case 'group_concat' : // @since 2.7
+        case 'subqueries' :   // @since 2.7
+            return version_compare($version, '4.1', '>=');
+            break;
+        endswitch;
+
+        return false;
     }