Skip to content

Commit ed1a640

Browse files
author
Chris Wiegman
committed
Handle negated defaults flag should a user pass "--no-defaults"
1 parent 222fc3d commit ed1a640

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/DB_Command.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,12 +1688,19 @@ private static function get_mysql_args( $assoc_args ) {
16881688
*/
16891689
protected function get_defaults_flag_string( &$assoc_args ) {
16901690

1691-
if ( true === Utils\get_flag_value( $assoc_args, 'defaults' ) ) {
1691+
$flag_string = ' --no-defaults';
1692+
1693+
if ( array_key_exists( 'defaults', $assoc_args ) ) {
1694+
1695+
if ( true === Utils\get_flag_value( $assoc_args, 'defaults' ) ) {
1696+
$flag_string = '';
1697+
}
1698+
16921699
unset( $assoc_args['defaults'] );
1693-
return '';
1700+
16941701
}
16951702

1696-
return ' --no-defaults';
1703+
return $flag_string;
16971704

16981705
}
16991706
}

0 commit comments

Comments
 (0)