[LON-CAPA-cvs] cvs: loncom /publisher lonupload.pm

[raeburn]

raeburn		Wed Nov  2 14:40:16 2011 EDT

  Modified files:              
    /loncom/publisher	lonupload.pm 
  Log:
  - Remove duplicate declaration for $url_root.
  
  
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.56 loncom/publisher/lonupload.pm:1.57
--- loncom/publisher/lonupload.pm:1.56	Mon Oct 31 01:28:47 2011
+++ loncom/publisher/lonupload.pm	Wed Nov  2 14:40:16 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.56 2011/10/31 01:28:47 raeburn Exp $
+# $Id: lonupload.pm,v 1.57 2011/11/02 14:40:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -406,7 +406,6 @@
     }
     my $url_root = "/priv/$udom/$uname";
     my $dir_root = $r->dir_config('lonDocRoot').$url_root;
-    my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);
     my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');
     my $state = &embedded_form_elems('modify_orightml',$filename,$mode).
@@ -462,8 +461,7 @@
 
     my $r=shift;
 
-    my $uname;
-    my $udom;
+    my ($uname,$udom);
     my $javascript = '';
 
     my $fn=$env{'form.filename'};