From 7f41c2d4c277fd053e3c90ffc66e23dde7cc68d0 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Fri, 7 Mar 2008 19:19:38 +0000 Subject: [PATCH] fixed: loadAllConfigs loads hidden files --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Config.pm | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 08e79ccc2..4b21be888 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -4,6 +4,7 @@ - fixed: exporting as HTML leaks sessions for inaccessible assets, - new YUI based date picker - fixed: changing image thumbnail size doesn't resize image + - fixed: loadAddConfigs loads hidden files 7.5.5 - fixed: Several typos in the new Calendar help documentation. diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm index 737a461a7..2ea2cba73 100644 --- a/lib/WebGUI/Config.pm +++ b/lib/WebGUI/Config.pm @@ -186,9 +186,12 @@ sub readAllConfigs { closedir(DIR); my %configs; foreach my $file (@files) { - if ($file =~ /\.conf$/ && !($file =~ /^log\.conf$/) && !($file =~ /^spectre\.conf$/)) { - $configs{$file} = WebGUI::Config->new($webguiPath,$file); - } + next + if $file !~ /\.conf$/ + || $file =~ /^\./ + || $file eq 'log.conf' + || $file eq 'spectre.conf'; + $configs{$file} = WebGUI::Config->new($webguiPath,$file); } return \%configs; }