if ($dao->activity_type_id == CRM_Core_OptionGroup::getValue('activity_type', 'Email', 'name')) {
$anyActivity = TRUE;
}
- $activityTypes = $this->allActivityTypes(FALSE, $anyActivity);
+ $activityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, $anyActivity);
$activityTypeInfo = NULL;
if (isset($activityTypes[$dao->activity_type_id])) {
else {
$query .= "AND cg.extends_entity_column_value IS NULL";
}
- $query .= "ORDER BY cf.weight";
+ $query .= "ORDER BY cg.weight, cf.weight";
$params = array(
1 => array($activityTypeID,
'Integer',