Changeset 10597

Timestamp:

02/19/2009 07:01:57 PM (14 years ago)

Author:

ryan

Message:

Use real escape in environments that support it. see #5455

File:

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

trunk/wp-includes/wp-db.php

@@ -274 +274 @@
 
     /**
+     * Whether to use mysql_real_escape_string
+     *
+     * @since 2.8.0
+     * @access public
+     * @var bool
+     */
+    var $real_escape = false;
+
+    /**
      * Connects to the database server and selects a database
      *
@@ -334 +343 @@
 
         if ( $this->has_cap( 'collation' ) ) {
-            $collation_query = '';
             if ( !empty($this->charset) ) {
-                $collation_query = "SET NAMES '{$this->charset}'";
-                if (!empty($this->collate) )
-                    $collation_query .= " COLLATE '{$this->collate}'";
+                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($collation_query) )
-                $this->query($collation_query);
-
         }
 
@@ -427 +437 @@
      */
     function escape($string) {
-        return addslashes( $string );
-        // Disable rest for now, causing problems
-        /*
-        if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' )
-            return mysql_escape_string( $string );
+        if ( $this->dbh && $this->real_escape )
+            return mysql_real_escape_string( $string, $this->dbh );
         else
-            return mysql_real_escape_string( $string, $this->dbh );
-        */
+            return addslashes( $string );
     }