Changeset 4686

Timestamp:

01/06/2007 11:36:51 PM (18 years ago)

Author:

ryan

Message:

Fiddle with object destruction and shutdown. Curses upon php 5.2. fixes #3354

Location:

trunk/wp-includes

Files:

• cache.php (modified) (3 diffs)
• wp-db.php (modified) (2 diffs)

trunk/wp-includes/cache.php

@@ -9 +9 @@
     global $wp_object_cache;
 
+    if ( ! isset($wp_object_cache) )
+        return;
     return $wp_object_cache->save();
 }
@@ -393 +395 @@
 
     function WP_Object_Cache() {
+        return $this->__construct();
+    }
+    
+    function __construct() {
         global $blog_id;
+
+        register_shutdown_function(array(&$this, "__destruct"));
 
         if (defined('DISABLE_CACHE'))
@@ -429 +437 @@
         $this->blog_id = $this->hash($blog_id);
     }
+
+    function __destruct() {
+        $this->save();
+        return true;    
+    }
 }
 ?>

trunk/wp-includes/wp-db.php

@@ -45 +45 @@
      */
     function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
+        return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
+    }
+    
+    function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
+        register_shutdown_function(array(&$this, "__destruct"));
+
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
         if (!$this->dbh) {
@@ -60 +66 @@
 
         $this->select($dbname);
+    }
+
+    function __destruct() {
+        return true;        
     }