Changeset 47107 for trunk/src/wp-includes/wp-db.php

Timestamp:

01/23/2020 12:25:38 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Cache API: Remove WP_Object_Cache::__destruct() and wpdb::__destruct().

Originally added in [4686], these constructor/destructor pairings were designed to prevent the objects from being destroyed before shutdown, when output buffers are flushed.

A deeper investigation reveals that this approach didn't quite work as expected and was later made redundant by introducing wp_ob_end_flush_all() in [5462].

Props wonderboymusic, nacin, Mte90, SergeyBiryukov.
Fixes #21402.

File:

• trunk/src/wp-includes/wp-db.php (modified) (2 diffs)

trunk/src/wp-includes/wp-db.php

@@ -605 +605 @@
          */
         public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-                register_shutdown_function( array( $this, '__destruct' ) );
-
                 if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
                         $this->show_errors();
@@ -631 +629 @@
 
                 $this->db_connect();
-        }
-
-        /**
-         * PHP5 style destructor and will run when database object is destroyed.
-         *
-         * @see wpdb::__construct()
-         * @since 2.0.8
-         * @return true
-         */
-        public function __destruct() {
-                return true;
         }