Ticket #10861: 10861.2.patch

wp-includes/wp-db.php

@@ -337 +337 @@
          * @param string $dbhost MySQL database host
          */
         function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
-                return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
+                $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
         }
 
         /**
@@ -355 +355 @@
          * @param string $dbhost MySQL database host
          */
         function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
-                register_shutdown_function(array(&$this, "__destruct"));
-
                 if ( defined('WP_DEBUG') and WP_DEBUG == true )
                         $this->show_errors();
 
@@ -403 +401 @@
         }
 
         /**
-         * PHP5 style destructor and will run when database object is destroyed.
-         *
-         * @since 2.0.8
-         *
-         * @return bool Always true
-         */
-        function __destruct() {
-                return true;
-        }
-
-        /**
          * Sets the table prefix for the WordPress tables.
          *
          * Also allows for the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE to