Commit 74ee0fba authored by Dave Greenberg's avatar Dave Greenberg

CRM-14488 - Additional fix for profiles with multiple Used For entries in uf_join table

----------------------------------------
* CRM-14488:
  https://issues.civicrm.org/jira/browse/CRM-14488
parent b053ef73
......@@ -125,18 +125,23 @@ class CRM_Profile_Form_Edit extends CRM_Profile_Form {
SELECT module,is_reserved
FROM civicrm_uf_group
LEFT JOIN civicrm_uf_join ON uf_group_id = civicrm_uf_group.id
WHERE civicrm_uf_group.id = %1
WHERE civicrm_uf_group.id = %1
";
$params = array(1 => array($this->_gid, 'Integer'));
$dao = CRM_Core_DAO::executeQuery($query, $params);
$error = $dao->fetch();
$isProfile = false;
while ($dao->fetch()) {
$isProfile = ($isProfile || ($dao->module == "Profile"));
}
//Check that the user has the "add contacts" Permission
$canAdd = CRM_Core_Permission::check("add contacts");
//Remove need for Profile module type when using reserved profiles [CRM-14488]
if( !$error || ($dao->module != "Profile" && !($dao->is_reserved && $canAdd))) {
if( !$dao->N || (!$isProfile && !($dao->is_reserved && $canAdd))) {
CRM_Core_Error::fatal(ts('The requested Profile (gid=%1) is not configured to be used for \'Profile\' edit and view forms in its Settings. Contact the site administrator if you need assistance.',
array(1 => $this->_gid)
));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment