Changes in trunk/wp-includes/wp-db.php [4741:5195]

File:

• trunk/wp-includes/wp-db.php (modified) (7 diffs)

trunk/wp-includes/wp-db.php

@@ -36 +36 @@
     var $postmeta;
 
+    var $charset;
+    var $collate;
+
     /**
      * Connects to the database server and selects a database
@@ -46 +49 @@
         return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
     }
-    
+
     function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
         register_shutdown_function(array(&$this, "__destruct"));
+
+        if ( defined('DB_CHARSET') )
+            $this->charset = DB_CHARSET;
+
+        if ( defined('DB_COLLATE') )
+            $this->collate = DB_COLLATE;
 
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
@@ -64 +73 @@
         }
 
+        if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+            $this->query("SET NAMES '$this->charset'");
+
         $this->select($dbname);
     }
 
     function __destruct() {
-        return true;        
+        return true;    
     }
 
@@ -170 +182 @@
         $this->result = @mysql_query($query, $this->dbh);
         ++$this->num_queries;
-    
+
         if (SAVEQUERIES)
             $this->queries[] = array( $query, $this->timer_stop() );
@@ -181 +193 @@
 
         if ( preg_match("/^\\s*(insert|delete|update|replace) /i",$query) ) {
-            $this->rows_affected = mysql_affected_rows();
+            $this->rows_affected = mysql_affected_rows($this->dbh);
             // Take note of the insert_id
             if ( preg_match("/^\\s*(insert|replace) /i",$query) ) {
@@ -244 +256 @@
         if ( $query )
             $this->query($query);
-        
+    
         if ( !isset($this->last_result[$y]) )
             return null;
@@ -361 +373 @@
         header('Content-Type: text/html; charset=utf-8');
 
-        if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+        if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
             $admin_dir = '';
         else