Changeset 3811

Timestamp:

05/31/2006 01:40:00 AM (20 years ago)

Author:

ryan

Message:

wp_salt() and more hash work.

Location:

trunk/wp-includes

Files:

• cache.php (modified) (4 diffs)
• pluggable-functions.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -65 +65 @@
     var $warm_cache_hits = 0;
     var $cache_misses = 0;
+    var $secret = '';
 
     function acquire_lock() {
@@ -175 +176 @@
 
     function hash($data) {
-        global $wp_server_secret;
-        if ( empty($wp_server_secret) )
-            $wp_server_secret = DB_PASSWORD;
-
         if ( function_exists('hash_hmac') ) {
-            return hash_hmac('md5', $data, $wp_server_secret);
+            return hash_hmac('md5', $data, $this->secret);
         } else {
-            return md5($data . $wp_server_secret);
+            return md5($data . $this->secret);
         }
     }
@@ -398 +395 @@
 
     function WP_Object_Cache() {
-        global $blog_id;
+        global $blog_id, $wpdb;
 
         if (defined('DISABLE_CACHE'))
@@ -427 +424 @@
             $this->expiration_time = CACHE_EXPIRATION_TIME;
 
+        if ( defined('WP_SECRET') )
+            $this->secret = WP_SECRET;
+        else
+            $this->secret = DB_PASSWORD . DB_USER . DB_NAME . DB_HOST . ABSPATH;
+
         $this->blog_id = $this->hash($blog_id);
     }

trunk/wp-includes/pluggable-functions.php

@@ -509 +509 @@
 endif;
 
+if ( !function_exists('wp_salt') ) :
+function wp_salt() {
+    $salt = get_option('secret');
+    if ( empty($salt) )
+        $salt = DB_PASSWORD . DB_USER . DB_NAME . DB_HOST . ABSPATH;
+
+    return $salt;
+}
+endif;
+
 if ( !function_exists('wp_hash') ) :
 function wp_hash($data) {
-    $secret = get_option('secret');
-    if ( empty($secret) )
-        $secret = DB_PASSWORD;
+    $salt = wp_salt();
 
     if ( function_exists('hash_hmac') ) {
-        return hash_hmac('md5', $data, $secret);
+        return hash_hmac('md5', $data, $salt);
     } else {
-        return md5($data . $secret);
+        return md5($data . $salt);
     }
 }