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

[raeburn]

raeburn		Thu Dec 20 02:58:05 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.179.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.9 loncom/interface/domainprefs.pm:1.160.6.10
--- loncom/interface/domainprefs.pm:1.160.6.9	Wed Dec 12 01:57:37 2012
+++ loncom/interface/domainprefs.pm	Thu Dec 20 02:58:05 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.9 2012/12/12 01:57:37 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.10 2012/12/20 02:58:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7047,10 +7047,12 @@
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
         $currpriv = $current->{'recaptchakeys'}{'private'};
-        $newsettings->{'recaptchakeys'} = {
-                                             public  => '',
-                                             private => '',
-                                          }
+        unless ($newsettings->{'captcha'} eq 'recaptcha') {
+            $newsettings->{'recaptchakeys'} = {
+                                                 public  => '',
+                                                 private => '',
+                                              }
+        }
     }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {