--- loncom/interface/londocs.pm 2012/07/05 21:33:39 1.489 +++ loncom/interface/londocs.pm 2012/07/06 22:46:06 1.490 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.489 2012/07/05 21:33:39 raeburn Exp $ +# $Id: londocs.pm,v 1.490 2012/07/06 22:46:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3464,7 +3464,7 @@ sub decompression_phase_one { my ($dir,$file,$warning,$error,$output); my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)= &decompression_info(); - if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) { + if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) { $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); } else { my $file = $1;