oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove WebGUI::Utility::isIn

Browse source
This commit is contained in:
Graham Knop 2010-09-07 12:33:15 -05:00
parent 0e754a51e4
commit 6aa26c2e44
61 changed files with 126 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/AssetExportHtml.pm
View file

@ -250,11 +250,11 @@ sub exportAsHtml {
# extrasUploadAction and rootUrlAction must have values matching something
# in the arrays defined above
if( defined $extrasUploadAction && !WebGUI::Utility::isIn($extrasUploadAction, @extraUploadActions) ) {
if( defined $extrasUploadAction && !$extrasUploadAction ~~ @extraUploadActions ) {
WebGUI::Error->throw(error => "'$extrasUploadAction' is not a valid extrasUploadAction");
}
if( defined $rootUrlAction && !WebGUI::Utility::isIn($rootUrlAction, @rootUrlActions) ) {
if( defined $rootUrlAction && !$rootUrlAction ~~ @rootUrlActions ) {
WebGUI::Error->throw(error => "'$rootUrlAction' is not a valid rootUrlAction");
}
@ -607,7 +607,7 @@ sub exportGetUrlAsPath {
my $filename = pop @pathComponents;
my ($extension) = $filename =~ /\.([^.]+)$/;
if ($extension && WebGUI::Utility::isIn($extension, @{ $fileTypes }) ) {
if ($extension && $extension ~~ $fileTypes ) {
return Path::Class::File->new($exportPath, @pathComponents, $filename);
}
else {