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

[albertel]

albertel		Fri Sep 22 15:59:32 2006 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - course language settings are supposed to trump user set lang settings
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.458 loncom/interface/loncommon.pm:1.459
--- loncom/interface/loncommon.pm:1.458	Thu Sep 21 17:23:15 2006
+++ loncom/interface/loncommon.pm	Fri Sep 22 15:59:30 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.458 2006/09/21 21:23:15 albertel Exp $
+# $Id: loncommon.pm,v 1.459 2006/09/22 19:59:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2353,7 +2353,8 @@
 	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
     }
     if ($env{'environment.languages'}) {
-	@languages=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'});
+	@languages=(@languages,
+		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
     }
     my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
     if ($browser) {