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

Timestamp:

10/11/2017 12:09:47 AM (7 years ago)

Author:

pento

Message:

Database: When parsing the host, leave the port and socket as null if they're not defined.

This fixes a change in behaviour introduced by [41629].

The host is set to an empty string when it isn't defined, this continues existing behaviour. In particular, the mysqli library treats a null host as being the same as localhost, which is not always the intended behaviour.

Props birgire, markjaquith, pento.
Fixes #41722.

File:

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

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

@@ -1480 +1480 @@
             $socket  = null;
             $is_ipv6 = false;
-            
+
             if ( $host_data = $this->parse_db_host( $this->dbhost ) ) {
                 list( $host, $port, $socket, $is_ipv6 ) = $host_data;
@@ -1622 +1622 @@
         }
 
+        $host = '';
         foreach ( array( 'host', 'port', 'socket' ) as $component ) {
-            if ( array_key_exists( $component, $matches ) ) {
-                $$component = $matches[$component];
+            if ( ! empty( $matches[ $component ] ) ) {
+                $$component = $matches[ $component ];
             }
         }