[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm

[raeburn]

raeburn		Sun Sep 22 02:24:27 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.564
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.40 loncom/interface/londocs.pm:1.484.2.41
--- loncom/interface/londocs.pm:1.484.2.40	Sun Sep  1 03:21:46 2013
+++ loncom/interface/londocs.pm	Sun Sep 22 02:24:27 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.40 2013/09/01 03:21:46 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.41 2013/09/22 02:24:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -712,7 +712,7 @@
              my $url = $env{'docs.markedcopy_url_'.$suffix};
              if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
                  ($url ne '')) {
-                 $pasteurls{$cid.'_'.$url};
+                 $pasteurls{$cid.'_'.$url} = 1;
              }
         }
     }
@@ -1109,8 +1109,7 @@
     }
 
     my (%msgs,%before,%after, at dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult,
-        %msgs);
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult);
 
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
@@ -1561,7 +1560,7 @@
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
-    my $url = $dbref->{'src'};
+    $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
         if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
@@ -3294,7 +3293,7 @@
                     push(@{$filtersref->{'randomorder'}},$orderidx);
                 }
             }
-            my $formname = 'edit_rorder_'.$orderidx;
+            $formname = 'edit_rorder_'.$orderidx;
 	    $rand_order_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".