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

[raeburn]

raeburn		Sat Oct 10 03:40:25 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	loncommon.pm 
  Log:
  - Backport 1.893, 1.895.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.692.4.17 loncom/interface/loncommon.pm:1.692.4.18
--- loncom/interface/loncommon.pm:1.692.4.17	Mon Sep  7 13:13:58 2009
+++ loncom/interface/loncommon.pm	Sat Oct 10 03:40:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.4.17 2009/09/07 13:13:58 raeburn Exp $
+# $Id: loncommon.pm,v 1.692.4.18 2009/10/10 03:40:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -492,6 +492,7 @@
     $output .= <<"ENDSTDBRW";
     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
         var url = '/adm/pickcourse?';
+        var formid = getFormIdByName(formname);
         var domainfilter = getDomainFromSelectbox(formname,udom);
         if (domainfilter != null) {
            if (domainfilter != '') {
@@ -4097,7 +4098,7 @@
     my $domain=shift;
     if (! $domain) {
         # Determine domain if we have not been given one
-        $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+        $domain = &Apache::lonnet::default_login_domain();
         if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
         if ($env{'request.role.domain'}) { 
             $domain=$env{'request.role.domain'};