[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm
raeburn
raeburn at source.lon-capa.org
Mon Jan 6 09:08:32 EST 2014
raeburn Mon Jan 6 14:08:32 2014 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface domainprefs.pm
Log:
- For 2.11
- Backport 1.222
- Remove trailing whitespace in one line changed in rev. 1.160.6.31
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.32 loncom/interface/domainprefs.pm:1.160.6.33
--- loncom/interface/domainprefs.pm:1.160.6.32 Fri Jan 3 20:42:51 2014
+++ loncom/interface/domainprefs.pm Mon Jan 6 14:08:31 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.160.6.32 2014/01/03 20:42:51 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.33 2014/01/06 14:08:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -404,7 +404,7 @@
if ($phase eq 'process') {
my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
\%prefs,\%domconfig,$confname,\@roles);
- if (ref($result) eq 'HASH') {
+ if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
$r->rflush();
&devalidate_remote_domconfs($dom,$result);
}
@@ -9280,7 +9280,7 @@
if ($user ne $dcname.':'.$dcdom) {
$table .= ' ('.$dcname.':'.$dcdom.')';
}
- $table .= '</label></span></td>';
+ $table .= '</label></span></td>';
}
$table .= '</tr></table>';
} elsif ($numdcs == 1) {
More information about the LON-CAPA-cvs
mailing list