Skip to content

Commit

Permalink
Issue #1320: tidying
Browse files Browse the repository at this point in the history
  • Loading branch information
bschmalhofer committed Nov 15, 2021
1 parent 9595b26 commit 380f236
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
7 changes: 3 additions & 4 deletions Kernel/Config/Defaults.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2117,10 +2117,9 @@ sub Get {
sub Set {
my ( $Self, %Param ) = @_;

for (qw(Key)) {
if ( !defined $Param{$_} ) {
$Param{$_} = '';
}
# assign default values
for my $Key (qw(Key)) {
$Param{$Key} //= '';
}

# debug
Expand Down
4 changes: 2 additions & 2 deletions Kernel/System/SysConfig.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3361,11 +3361,11 @@ sub ConfigurationDeploy {

$Param{NoValidation} //= 0;

# TODO: use the absolute path
my $BasePath = 'Kernel/Config/Files/';

# Parameter 'FileName' is intentionally not documented in the API as it is only used for testing.
my $TargetPath = $BasePath . ( $Param{FileName} || 'ZZZAAuto.pm' );
my $FileName = $Param{FileName} || 'ZZZAAuto.pm';
my $TargetPath = $BasePath . $FileName;

my $SysConfigDBObject = $Kernel::OM->Get('Kernel::System::SysConfig::DB');

Expand Down
1 change: 1 addition & 0 deletions scripts/test/SysConfig/ConfigurationDeploy.t
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ for my $Test (@Tests1) {
next TEST;
}

# The param FileName overrides the default file name ZZZAAuto.pm
$SysConfigObject->ConfigurationDeploy(
%{ $Test->{Config} },
Force => 1,
Expand Down

0 comments on commit 380f236

Please sign in to comment.