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

[raeburn]

raeburn		Fri Jan  4 00:17:49 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.526, 1.527.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.19 loncom/interface/londocs.pm:1.484.2.20
--- loncom/interface/londocs.pm:1.484.2.19	Thu Dec 13 04:51:41 2012
+++ loncom/interface/londocs.pm	Fri Jan  4 00:17:48 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.19 2012/12/13 04:51:41 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.20 2013/01/04 00:17:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -651,7 +651,7 @@
         $is_external = 1;
     }
 
-    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
+    my ($canpaste,$nopaste,$othercrs,$areachange);
     if ($folder =~ /^supplemental/) {
         $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
         unless ($canpaste) {
@@ -1543,7 +1543,7 @@
             if ($folder !~ /^supplemental/) {
                 $report = 1;
             }
-            my ($outtext,$errtext) =
+            (my $outtext,$errtext) =
                 &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
             if ($errtext) {
                 return &mt('Paste failed: an error occurred saving the folder or page.');
@@ -4219,7 +4219,7 @@
     my $form;
     my $activetab;
     my $active;
-    if($env{'form.active'} ne ''){
+    if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) {
         $activetab = $env{'form.active'};
     }
     my $backicon = $iconpath.'clickhere.gif';