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

[raeburn]

raeburn		Fri Apr 24 04:58:28 2009 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Avoid calling lonconfigsettings::print_header() twice.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.93 loncom/interface/domainprefs.pm:1.94
--- loncom/interface/domainprefs.pm:1.93	Wed Apr 22 14:09:13 2009
+++ loncom/interface/domainprefs.pm	Fri Apr 24 04:58:27 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.93 2009/04/22 14:09:13 raeburn Exp $
+# $Id: domainprefs.pm,v 1.94 2009/04/24 04:58:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,7 +204,6 @@
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
     } else {
         if (keys(%domconfig) == 0) {
-            &Apache::lonconfigsettings::print_header($r,$phase,$context);
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
             if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
@@ -222,6 +221,7 @@
                     }
                 }
                 if ($custom_img_count > 0) {
+                    &Apache::lonconfigsettings::print_header($r,$phase,$context);
                     my $switch_server = &check_switchserver($dom,$confname);
                     $r->print(
     &mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.