*7985* Tweaks

Puckohue · Oct 26, 2012 · ac90d6c · ac90d6c
1 parent 459fbc5
commit ac90d6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/classes/user/form/RegistrationForm.inc.php b/classes/user/form/RegistrationForm.inc.php
@@ -93,14 +93,12 @@ function display() {
 		$journal =& Request::getJournal();
 
 		if ($this->captchaEnabled) {
-			if ($this->captchaEnabled) {
-				import('lib.pkp.lib.recaptcha.recaptchalib');
-				$publicKey = Config::getVar('captcha', 'recaptcha_public_key');
-				$useSSL = Config::getVar('security', 'force_ssl')?true:false;
-				$reCaptchaHtml = recaptcha_get_html($publicKey, null, $useSSL);
-				$templateMgr->assign('reCaptchaHtml', $reCaptchaHtml);
-				$templateMgr->assign('captchaEnabled', true);
-			}
+			import('lib.pkp.lib.recaptcha.recaptchalib');
+			$publicKey = Config::getVar('captcha', 'recaptcha_public_key');
+			$useSSL = Config::getVar('security', 'force_ssl')?true:false;
+			$reCaptchaHtml = recaptcha_get_html($publicKey, null, $useSSL);
+			$templateMgr->assign('reCaptchaHtml', $reCaptchaHtml);
+			$templateMgr->assign('captchaEnabled', true);
 		}
 
 		$countryDao =& DAORegistry::getDAO('CountryDAO');

diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
@@ -377,10 +377,10 @@
 recaptcha = off
 
 ; Public key for reCaptcha (see http://www.google.com/recaptcha)
-; recaptcha_public_key = your_public_key
+recaptcha_public_key = your_public_key
 
 ; Private key for reCaptcha (see http://www.google.com/recaptcha)
-; recaptcha_private_key = your_private_key
+recaptcha_private_key = your_private_key
 
 ; Whether or not to use Captcha on user registration
 captcha_on_register = on