--- loncom/interface/loncommon.pm	2011/10/31 17:27:15	1.1026
+++ loncom/interface/loncommon.pm	2011/11/02 23:05:07	1.1027
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1026 2011/10/31 17:27:15 raeburn Exp $
+# $Id: loncommon.pm,v 1.1027 2011/11/02 23:05:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8824,12 +8824,12 @@ sub upload_embedded {
             my $fullpath = $dir_root.$dirpath.'/'.$path;
             my $dest = $fullpath.$fname;
             my $url = $url_root.$dirpath.'/'.$path.$fname;
-            my @parts=split(/\//,$fullpath);
+            my @parts=split(/\//,"$dirpath/$path");
             my $count;
             my $filepath = $dir_root;
-            for ($count=4;$count<=$#parts;$count++) {
-                $filepath .= "/$parts[$count]";
-                if ((-e $filepath)!=1) {
+            foreach my $subdir (@parts) {
+                $filepath .= "/$subdir";
+                if (!-e $filepath) {
                     mkdir($filepath,0770);
                 }
             }
@@ -8948,7 +8948,7 @@ sub modify_html_refs {
     } elsif ($context eq 'coursedoc') {
         $container = $env{'form.primaryurl'};
     } else {
-        $container = $env{'form.filename'};
+        $container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'};
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');