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

[raeburn]

raeburn		Mon Mar 11 13:33:25 2013 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Stop creation of duplicate // in URL in uploaded.photourl item for 
    templated simplepage and bulletinboard.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1217 loncom/lonnet/perl/lonnet.pm:1.1218
--- loncom/lonnet/perl/lonnet.pm:1.1217	Mon Mar  4 01:46:31 2013
+++ loncom/lonnet/perl/lonnet.pm	Mon Mar 11 13:33:24 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1217 2013/03/04 01:46:31 raeburn Exp $
+# $Id: lonnet.pm,v 1.1218 2013/03/11 13:33:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3193,7 +3193,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);