[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm

raeburn raeburn at source.lon-capa.org
Sat Nov 16 14:56:02 EST 2013


raeburn		Sat Nov 16 19:56:02 2013 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Skip call to &clean_path() for embedded objects which are web addresses.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1157 loncom/interface/loncommon.pm:1.1158
--- loncom/interface/loncommon.pm:1.1157	Sun Sep 29 00:49:28 2013
+++ loncom/interface/loncommon.pm	Sat Nov 16 19:56:02 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1157 2013/09/29 00:49:28 raeburn Exp $
+# $Id: loncommon.pm,v 1.1158 2013/11/16 19:56:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9876,12 +9876,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