Skip to content

Commit

Permalink
Item9232: fix one error exposed by recent refactoring, plus remove th…
Browse files Browse the repository at this point in the history
…e check I put in for another error that is trigger by regexps - the error is survivable

git-svn-id: http://svn.foswiki.org/trunk@8037 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
CrawfordCurrie authored and CrawfordCurrie committed Jul 6, 2010
1 parent d8aa10f commit c06b0a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 3 additions & 0 deletions core/lib/Foswiki/Configure/Checkers/Log/Dir.pm
Expand Up @@ -19,6 +19,9 @@ sub check {

my $ld = $Foswiki::cfg{Log}{Dir};
$ld =~ s/\$Foswiki::cfg({[^}]+})+/eval("\$Foswiki::cfg$1")/ge;
# Because of the eval, $ld now has to be untainted.
$ld =~ /^(.*)$/;
$ld = $1;

my $d;
if ( opendir( $d, $ld ) ) {
Expand Down
2 changes: 0 additions & 2 deletions core/lib/Foswiki/Configure/Load.pm
Expand Up @@ -160,8 +160,6 @@ sub expandValue {
map { expandValue($_) } values %{$_[0]};
} elsif (ref($_[0]) eq 'ARRAY') {
map { expandValue($_) } @{$_[0]};
} elsif (ref($_[0])) {
Carp::confess("Can't handle a ".ref($_[0]));
} else {
$_[0] =~ s/(\$Foswiki::cfg{[[A-Za-z0-9{}]+})/_handleExpand($1)/ge;
}
Expand Down

0 comments on commit c06b0a4

Please sign in to comment.