[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm
raeburn
raeburn at source.lon-capa.org
Wed Nov 20 00:11:35 EST 2013
raeburn Wed Nov 20 05:11:35 2013 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface loncommon.pm
Log:
- For 2.11
- Backport 1.1158
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.54 loncom/interface/loncommon.pm:1.1075.2.55
--- loncom/interface/loncommon.pm:1.1075.2.54 Sun Sep 29 06:57:54 2013
+++ loncom/interface/loncommon.pm Wed Nov 20 05:11:34 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1075.2.54 2013/09/29 06:57:54 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.55 2013/11/20 05:11:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -9861,12 +9861,13 @@
} else {
$embed_file = $file;
}
- my $absolutepath;
- my $cleaned_file = &clean_path($embed_file);
- if ($cleaned_file =~ m{^\w+://}) {
+ my ($absolutepath,$cleaned_file);
+ if ($embed_file =~ m{^\w+://}) {
+ $cleaned_file = $embed_file;
$newfiles{$cleaned_file} = 1;
$mapping{$cleaned_file} = $embed_file;
} else {
+ $cleaned_file = &clean_path($embed_file);
if ($embed_file =~ m{^/}) {
$absolutepath = $embed_file;
}
More information about the LON-CAPA-cvs
mailing list