[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages/annotator admannotations.pm /interface loncommon.pm

[raeburn]

raeburn		Thu Jan  8 19:37:53 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
    /loncom/html/res/adm/pages/annotator	admannotations.pm 
  Log:
  - Bug 5858.
  - Dn't delete $env{'request.enc'} from %env when you need it elsewhere during processing of the current request.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.729 loncom/interface/loncommon.pm:1.730
--- loncom/interface/loncommon.pm:1.729	Wed Dec 31 23:15:42 2008
+++ loncom/interface/loncommon.pm	Thu Jan  8 19:37:48 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.729 2008/12/31 23:15:42 raeburn Exp $
+# $Id: loncommon.pm,v 1.730 2009/01/08 19:37:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9934,11 +9934,13 @@
 }
 
 sub clean_symb {
-    my ($symb) = @_;
+    my ($symb,$delete) = @_;
 
     &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};
-    delete($env{'request.enc'});
+    if ($delete) {
+        delete($env{'request.enc'});
+    }
 
     return ($symb,$enc);
 }
Index: loncom/html/res/adm/pages/annotator/admannotations.pm
diff -u loncom/html/res/adm/pages/annotator/admannotations.pm:1.31 loncom/html/res/adm/pages/annotator/admannotations.pm:1.32
--- loncom/html/res/adm/pages/annotator/admannotations.pm:1.31	Thu Dec 11 13:33:48 2008
+++ loncom/html/res/adm/pages/annotator/admannotations.pm	Thu Jan  8 19:37:53 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # This will take annotations and then plug them into a page.
 #
-# $Id: admannotations.pm,v 1.31 2008/12/11 13:33:48 raeburn Exp $
+# $Id: admannotations.pm,v 1.32 2009/01/08 19:37:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -179,8 +179,8 @@
 
     my $page;
 
-    my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($env{'form.symbold'});
-    my ($symb_new,$symb_new_enc) = &Apache::loncommon::clean_symb($env{'form.symbnew'});
+    my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($env{'form.symbold'},1);
+    my ($symb_new,$symb_new_enc) = &Apache::loncommon::clean_symb($env{'form.symbnew'},1);
 
     my $annotation=$env{'form.annotation'};