Skip to content

Commit

Permalink
Item12952: Need copy of hash not hashref
Browse files Browse the repository at this point in the history
So configure will show changes to the configuration file including
remapping of obsolete variables.
  • Loading branch information
gac410 committed Sep 10, 2014
1 parent 6f2d2b0 commit d63011d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions core/lib/Foswiki/Configure/Wizards/Save.pm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ sub save {
my ( @backups, $backup );

my $old_content;
my $orig_content; # used so diff detects remapping of keys
my %orig_content; # used so diff detects remapping of keys
my %changeLog;

my $root = Foswiki::Configure::Root->new();
Expand Down Expand Up @@ -150,7 +150,7 @@ sub save {
die "Error reading existing LocalSite.cfg: $@";
}
else {
$orig_content = \%Foswiki::cfg;
%orig_content = %Foswiki::cfg;

# Clean out deprecated settings, so they don't occlude the
# replacements
Expand Down Expand Up @@ -227,8 +227,8 @@ sub save {
}
$reporter->NOTE("New configuration saved in $lsc");

_compareConfigs( $root, $orig_content, \%Foswiki::cfg, $reporter )
if $orig_content;
_compareConfigs( $root, \%orig_content, \%Foswiki::cfg, $reporter )
if (%orig_content);
}
else {
unlink $backup if ($backup);
Expand Down

0 comments on commit d63011d

Please sign in to comment.