[LON-CAPA-cvs] cvs: loncom /localize lonlocal.pm

[raeburn]

raeburn		Thu Oct  1 20:22:33 2009 EDT

  Modified files:              
    /loncom/localize	lonlocal.pm 
  Log:
  - Better choice of default domain for multi-domain servers.
  
  
Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.59 loncom/localize/lonlocal.pm:1.60
--- loncom/localize/lonlocal.pm:1.59	Wed May  6 19:25:49 2009
+++ loncom/localize/lonlocal.pm	Thu Oct  1 20:22:33 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.59 2009/05/06 19:25:49 droeschl Exp $
+# $Id: lonlocal.pm,v 1.60 2009/10/01 20:22:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,8 +262,8 @@
         push(@languages,@browser);
     }
 
-    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},
-                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
+    my $defdom = &Apache::lonnet::default_login_domain();
+    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
         if ($domtype ne '') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
             if ($domdefs{'lang_def'} ne '') {