[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface loncommon.pm
raeburn
raeburn@source.lon-capa.org
Thu, 11 Dec 2008 18:41:03 -0000
raeburn Thu Dec 11 18:41:03 2008 EDT
Modified files: (Branch: version_2_8_X)
/loncom/interface loncommon.pm
Log:
- Backport 1.699.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.692.2.1 loncom/interface/loncommon.pm:1.692.2.2
--- loncom/interface/loncommon.pm:1.692.2.1 Thu Dec 11 18:37:02 2008
+++ loncom/interface/loncommon.pm Thu Dec 11 18:41:03 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.692.2.1 2008/12/11 18:37:02 raeburn Exp $
+# $Id: loncommon.pm,v 1.692.2.2 2008/12/11 18:41:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3880,7 +3880,14 @@
if (ref($domconfig{'login'}) eq 'HASH') {
if (keys(%{$domconfig{'login'}})) {
foreach my $key (keys(%{$domconfig{'login'}})) {
- $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+ if (ref($domconfig{'login'}{$key}) eq 'HASH') {
+ foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+ $designhash{$udom.'.login.'.$key.'_'.$img} =
+ $domconfig{'login'}{$key}{$img};
+ }
+ } else {
+ $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+ }
}
} else {
$legacy{'login'} = 1;