Changeset 12409 for trunk/wp-includes/wp-db.php

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

File:

• trunk/wp-includes/wp-db.php (modified) (1 diff)

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);
             }
         }