add error_message on curl error+json_decode error

diff --git a/api/class.api.php b/api/class.api.php
index 06bc404ec5a34c51719e9f6bf450d357cf2f4d3b..f6c9f500b4a8c6b70621e8eae04b7944776a8bb2 100644 (file)
--- a/api/class.api.php
+++ b/api/class.api.php
@@ -173,11 +173,22 @@ class civicrm_api3 {
       if (curl_errno($ch)) {
         $res = new stdClass;
         $res->is_error = 1;
+        $res->error_message = curl_error($ch);
+        $res->level = "cURL";
         $res->error = array('cURL error' => curl_error($ch));
         return $res;
       }
       curl_close($ch);
-      return json_decode($result);
+      $res = json_decode($result);
+      if (!$res) {
+        $res = new stdClass;
+        $res->is_error = 1;
+        $res->error_message = "not a valid json returned by the server";
+        $res->level = "json_decode";
+        $res->row_result = $result;
+        
+      }
+      return $res;
     }
     else {
       // Should be discouraged, because the API credentials and data