[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Mon Mar 18 00:30:46 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    - Backport 1.1218.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.20 loncom/lonnet/perl/lonnet.pm:1.1172.2.21
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.20	Mon Mar 11 13:24:09 2013
+++ loncom/lonnet/perl/lonnet.pm	Mon Mar 18 00:30:46 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.20 2013/03/11 13:24:09 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.21 2013/03/18 00:30:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3184,7 +3184,9 @@
 					 $codebase,$thumbwidth,$thumbheight,
                                          $resizewidth,$resizeheight,$context,$mimetype);
         } else {
-            $fname=$env{'form.folder'}.'/'.$fname;
+            if ($env{'form.folder'}) {
+                $fname=$env{'form.folder'}.'/'.$fname;
+            }
             return &process_coursefile('uploaddoc',$docuname,$docudom,
 				       $fname,$formname,$parser,
 				       $allfiles,$codebase,$mimetype);