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

[raeburn]

raeburn		Sun Sep 22 01:54:14 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.207, 1.208
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.24 loncom/interface/domainprefs.pm:1.160.6.25
--- loncom/interface/domainprefs.pm:1.160.6.24	Tue Sep 10 01:52:35 2013
+++ loncom/interface/domainprefs.pm	Sun Sep 22 01:54:13 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.24 2013/09/10 01:52:35 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.25 2013/09/22 01:54:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1944,7 +1944,7 @@
 
 sub print_requestmail {
     my ($dom,$action,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%currapp,$rows);
+    my ($now,$datatable,%currapp);
     $now = time;
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'notify'}) eq 'HASH') {
@@ -5532,7 +5532,7 @@
     if ($file=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $output = 
-            &mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); 
+            &mt('Invalid file extension ([_1]) - reserved for internal use.',$1); 
     } elsif ($file=~/\.(\w+)$/ &&
         !defined(&Apache::loncommon::fileembstyle($1))) {
         $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);