Changeset 4841

Timestamp:

01/30/07 18:33:48 (2 years ago)

Author:

markjaquith

Message:

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

Files:

• branches/2.0/wp-includes/cache.php (modified) (3 diffs)
• branches/2.0/wp-includes/wp-db.php (modified) (2 diffs)

branches/2.0/wp-includes/cache.php

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

branches/2.0/wp-includes/wp-db.php

@@ -41 +41 @@
-
-    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) {
@@ -56 +62 @@
-
-        $this->select($dbname);
+    }
+
+    function __destruct() {
+        return true;        
-    }
-