[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

[raeburn]

raeburn		Mon Jun  5 21:21:52 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.301
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.83 loncom/interface/domainprefs.pm:1.160.6.84
--- loncom/interface/domainprefs.pm:1.160.6.83	Tue May 30 00:13:11 2017
+++ loncom/interface/domainprefs.pm	Mon Jun  5 21:21:51 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.83 2017/05/30 00:13:11 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.84 2017/06/05 21:21:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3062,8 +3062,10 @@
         my $css_class;
         my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
         my (%customroles,%ordered,%current);
-        if (ref($settings->{'adhoc'}) eq 'HASH') {
-            %current = %{$settings->{'adhoc'}};
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'adhoc'}) eq 'HASH') {
+                %current = %{$settings->{'adhoc'}};
+            }
         }
         my $count = 0;
         foreach my $key (sort(keys(%existing))) {