From 0086c33dc3770c2c71e1d56bdb6fc59b2cf5bd1b Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Fri, 12 Apr 2013 11:26:53 -0700 Subject: [PATCH] CRM-12334 formatting and always assign a value ---------------------------------------- * CRM-12334: $config->activityAssigneeNotification referenced in tpl but never set http://issues.civicrm.org/jira/browse/CRM-12334 --- CRM/Activity/Form/Activity.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index 4134a50179..392af8294a 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -407,7 +407,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { $urlParams .= "&qfKey=$qfKey"; } $path = CRM_Utils_System::currentPath(); - if ($this->_compContext == 'advanced' || + if ($this->_compContext == 'advanced' || $path == 'civicrm/contact/search/advanced') { $urlString = 'civicrm/contact/search/advanced'; } @@ -886,10 +886,15 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { $this->addFormRule(array('CRM_Activity_Form_Activity', 'formRule'), $this); - if ( CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, - 'activity_assignee_notification' ) + if (CRM_Core_BAO_Setting::getItem( + CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, + 'activity_assignee_notification' + ) ) { - $this->assign('activityAssigneeNotification', true); + $this->assign('activityAssigneeNotification', TRUE); + } + else { + $this->assign('activityAssigneeNotification', FALSE); } } -- 2.25.1