Merge branch '4.4' into master

[civicrm-core.git] / api / v3 / Activity.php

diff --git a/api/v3/Activity.php b/api/v3/Activity.php
index 6181029b71d8aba0905f64953c2cc216f38d315a..ddade215981e22a9501646cee18c7a1d76510725 100644 (file)
--- a/api/v3/Activity.php
+++ b/api/v3/Activity.php
@@ -114,7 +114,7 @@ function civicrm_api3_activity_create($params) {
           if (is_object($activityDAO)) {
             $activityDAO->free();
           }
-          return civicrm_api3_create_error(ts("Unable to revision existing case activity."), NULL, $activityDAO);
+          return civicrm_api3_create_error(ts("Unable to revision existing case activity."));
         }
         $createRevision = TRUE;
       }
@@ -235,6 +235,10 @@ function civicrm_api3_activity_get($params) {
   else {
     $activities = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE);
   }
+  $options = _civicrm_api3_get_options_from_params($params, FALSE,'activity','get');
+  if($options['is_count']) {
+    return civicrm_api3_create_success($activities, $params, 'activity', 'get');
+  }
 
   $activities = _civicrm_api3_activity_get_formatResult($params, $activities);
   //legacy custom data get - so previous formatted response is still returned too