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

[raeburn]

raeburn		Thu Dec 20 02:43:29 2012 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Set public and private recaptcha keys to null if not using recaptcha.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.178 loncom/interface/domainprefs.pm:1.179
--- loncom/interface/domainprefs.pm:1.178	Tue Dec 18 15:20:50 2012
+++ loncom/interface/domainprefs.pm	Thu Dec 20 02:43:28 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.178 2012/12/18 15:20:50 raeburn Exp $
+# $Id: domainprefs.pm,v 1.179 2012/12/20 02:43:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7090,10 +7090,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') {