From ac90d6c4902a033e36e74e97a47d3addaedf45b0 Mon Sep 17 00:00:00 2001 From: Alec Smecher Date: Fri, 26 Oct 2012 16:42:16 -0700 Subject: [PATCH] *7985* Tweaks --- classes/user/form/RegistrationForm.inc.php | 14 ++++++-------- config.TEMPLATE.inc.php | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/classes/user/form/RegistrationForm.inc.php b/classes/user/form/RegistrationForm.inc.php index 1434afcaece..9abe6b1b691 100644 --- 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 index 5a9354d56af..c988d1dc6fd 100644 --- 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