remove the superfluous '.'s from the exportBinaryExtensions config field and

update exportGetUrlAsPath's regex to match.
This commit is contained in:
Chris Nehren 2008-10-17 20:36:35 +00:00
parent 67c0fd3dfb
commit a30b919cff
2 changed files with 31 additions and 31 deletions

View file

@ -837,36 +837,36 @@
# extensions that the export system should pass through as-is instead of using # extensions that the export system should pass through as-is instead of using
# index.html # index.html
"exportBinaryExtensions" : [ "exportBinaryExtensions" : [
".html", "html",
".htm", "htm",
".txt", "txt",
".pdf", "pdf",
".jpg", "jpg",
".css", "css",
".gif", "gif",
".png", "png",
".doc", "doc",
".xls", "xls",
".xml", "xml",
".rss", "rss",
".bmp", "bmp",
".mp3", "mp3",
".js", "js",
".fla", "fla",
".flv", "flv",
".swf", "swf",
".pl", "pl",
".php", "php",
".php3", "php3",
".php4", "php4",
".php5", "php5",
".ppt", "ppt",
".docx", "docx",
".zip", "zip",
".tar", "tar",
".rar", "rar",
".gz", "gz",
".bz2" "bz2"
] ]
} }

View file

@ -543,7 +543,7 @@ sub exportGetUrlAsPath {
return Path::Class::File->new($exportPath, @pathComponents, $filename, $index); return Path::Class::File->new($exportPath, @pathComponents, $filename, $index);
} }
else { # got a dot else { # got a dot
my $extension = (fileparse($filename, qr/\.[^.]*/))[2]; # get just the extension my $extension = (fileparse($filename, qr/[^.]*$/))[2]; # get just the extension
# check if the file type is recognised by apache. if it is, return it # check if the file type is recognised by apache. if it is, return it
# as-is. if not, slap on the directory separator, $index, and return # as-is. if not, slap on the directory separator, $index, and return