Changeset 27925

Timestamp:

04/03/2014 04:05:31 AM (12 years ago)

Author:

nacin

Message:

Database: Add $allow_bail argument to wpdb::check_connection() to match the connect method.

props DrProtocols, pento.
fixes #27240.

File:

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

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

@@ -1387 +1387 @@
          * @since 3.9.0
          *
+         * @param bool $allow_bail Optional. Allows the function to bail, default true. If this is set
+         *                         to false, you will need to handle the lack of database connection
+         *                         manually.
+         *
          * @return bool True if the connection is up.
          */
-        function check_connection() {
+        function check_connection( $allow_bail = true ) {
                 if ( $this->use_mysqli ) {
                         if ( @mysqli_ping( $this->dbh ) ) {
@@ -1429 +1433 @@
                 // Let's just return and hope for the best.
                 if ( did_action( 'template_redirect' ) ) {
+                        return false;
+                }
+
+                if ( ! $allow_bail ) {
                         return false;
                 }