Skip to content

Commit ece1b73

Browse files
committed
Translate --host, --user, --password, and --database options in maybe_load_wpdb()
Ensure all standard MySQL connection flags (user, password/pass, database, host) as well as dbuser/dbpass/dbname/dbhost are mapped to the fallback wpdb instance.
1 parent f0eb585 commit ece1b73

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/DB_Command.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,16 +2501,16 @@ protected function maybe_load_wpdb( $assoc_args = [] ) {
25012501
$default_name = defined( 'DB_NAME' ) ? DB_NAME : '';
25022502
$default_host = defined( 'DB_HOST' ) ? DB_HOST : '';
25032503

2504-
$db_user = Utils\get_flag_value( $assoc_args, 'dbuser', $default_user );
2505-
$db_pass = Utils\get_flag_value( $assoc_args, 'dbpass', $default_pass );
2506-
$db_name = Utils\get_flag_value( $assoc_args, 'dbname', $default_name );
2507-
$db_host = Utils\get_flag_value( $assoc_args, 'dbhost', $default_host );
2504+
$db_user = Utils\get_flag_value( $assoc_args, 'dbuser', Utils\get_flag_value( $assoc_args, 'user', $default_user ) );
2505+
$db_pass = Utils\get_flag_value( $assoc_args, 'dbpass', Utils\get_flag_value( $assoc_args, 'password', Utils\get_flag_value( $assoc_args, 'pass', $default_pass ) ) );
2506+
$db_name = Utils\get_flag_value( $assoc_args, 'dbname', Utils\get_flag_value( $assoc_args, 'database', $default_name ) );
2507+
$db_host = Utils\get_flag_value( $assoc_args, 'dbhost', Utils\get_flag_value( $assoc_args, 'host', $default_host ) );
25082508

25092509
$has_custom_credentials = (
2510-
( isset( $assoc_args['dbuser'] ) && $default_user !== $assoc_args['dbuser'] ) ||
2511-
( isset( $assoc_args['dbpass'] ) && $default_pass !== $assoc_args['dbpass'] ) ||
2512-
( isset( $assoc_args['dbname'] ) && $default_name !== $assoc_args['dbname'] ) ||
2513-
( isset( $assoc_args['dbhost'] ) && $default_host !== $assoc_args['dbhost'] )
2510+
( $default_user !== $db_user ) ||
2511+
( $default_pass !== $db_pass ) ||
2512+
( $default_name !== $db_name ) ||
2513+
( $default_host !== $db_host )
25142514
);
25152515

25162516
if ( isset( $wpdb ) && $wpdb instanceof wpdb && ! $has_custom_credentials ) {

0 commit comments

Comments
 (0)