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

[www]

www		Mon Oct 24 22:02:42 2011 EDT

  Modified files:              
    /loncom/imspackages	imsimport.pm 
    /loncom/interface	loncommon.pm 
  Log:
  Bug #1320
  
  
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.34 loncom/imspackages/imsimport.pm:1.35
--- loncom/imspackages/imsimport.pm:1.34	Mon Oct 24 21:58:04 2011
+++ loncom/imspackages/imsimport.pm	Mon Oct 24 22:02:38 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # 
-# $Id: imsimport.pm,v 1.34 2011/10/24 21:58:04 www Exp $
+# $Id: imsimport.pm,v 1.35 2011/10/24 22:02:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -754,7 +754,7 @@
     } elsif ( ($env{'form.phase'} eq 'three') || ($env{'form.phase'} eq 'four') ) {
         my $docroot = $env{'form.newdir'};
         my $newdir = '';
-        if ($docroot =~ m|public_html/(.+)$|) {
+        if ($docroot =~ m|/(.+)$|) {
             $newdir = $1;
         }
         if ($env{'form.phase'} eq 'three') {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1022 loncom/interface/loncommon.pm:1.1023
--- loncom/interface/loncommon.pm:1.1022	Mon Oct 24 19:36:06 2011
+++ loncom/interface/loncommon.pm	Mon Oct 24 22:02:41 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1022 2011/10/24 19:36:06 www Exp $
+# $Id: loncommon.pm,v 1.1023 2011/10/24 22:02:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8938,7 +8938,6 @@
         $container = $env{'form.primaryurl'};
     } else {
         $container = $env{'form.filename'};
-        $container =~ s{^/priv/(\Q$uname\E)/(.*)}{/home/$1/public_html/$2};
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');