Merge pull request #11197 from agileware/CRM-21104
authorcolemanw <coleman@civicrm.org>
Wed, 18 Jul 2018 16:17:25 +0000 (12:17 -0400)
committerGitHub <noreply@github.com>
Wed, 18 Jul 2018 16:17:25 +0000 (12:17 -0400)
CRM-21104: Forcing reCaptcha on Contribution pages(with online payments) which have no Profile associated with them.

1  2 
CRM/Admin/Form/Setting/Miscellaneous.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/ContributionBase.php
CRM/Core/Config/MagicMerge.php
CRM/Utils/ReCAPTCHA.php
settings/Core.setting.php
templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
templates/CRM/Contribute/Form/Contribution/Main.tpl

Simple merge
Simple merge
Simple merge