Ticket #10861: 10861.patch

wp-includes/wp-db.php

@@ -337 +337 @@
          * @param string $dbhost MySQL database host
          */
         function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
+                register_shutdown_function(array(&$this, "__destruct"));
+                
                 return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
         }
 
@@ -355 +357 @@
          * @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();
 
@@ -405 +405 @@
         /**
          * PHP5 style destructor and will run when database object is destroyed.
          *
+         * Destructor void __destruct ( void )
+         * 
+         * @see http://www.php.net/manual/en/language.oop5.decon.php
          * @since 2.0.8
          *
-         * @return bool Always true
+         * @return void A PHP5 style descrutctor does not return a value
          */
         function __destruct() {
-                return true;
         }
 
         /**