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

Fri, 28 Jul 2006 06:09:35 -0000

albertel		Fri Jul 28 02:09:35 2006 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - BUG#3940, add_entries values should override default design not the other way
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.437 loncom/interface/loncommon.pm:1.438

--- loncom/interface/loncommon.pm:1.437	Tue Jul 25 11:52:58 2006
+++ loncom/interface/loncommon.pm	Fri Jul 28 02:09:34 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.437 2006/07/25 15:52:58 albertel Exp $
+# $Id: loncommon.pm,v 1.438 2006/07/28 06:09:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2875,7 +2875,7 @@
                    'alink'   => &designparm($function.'.alink',$domain),
 		   'vlink'   => &designparm($function.'.vlink',$domain),
 		   'link'    => &designparm($function.'.link',$domain),);
-    @$addentries{keys(%design)} = @design{keys(%design)};
+    @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; 
 
  # role and realm
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
@@ -2900,7 +2900,7 @@
     my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
 
-    my $extra_body_attr = &make_attr_string($forcereg,$addentries);
+    my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
 # construct main body tag
     my $bodytag = "<body $extra_body_attr>".



