diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php index 647032795..36388e271 100644 --- a/application/core/FHCAPI_Controller.php +++ b/application/core/FHCAPI_Controller.php @@ -94,7 +94,7 @@ class FHCAPI_Controller extends Auth_Controller // --------------------------------------------------------------- /** - * @param array $data + * @param string|array|object $data * @param string $type (optional) * @return void */ @@ -110,6 +110,8 @@ class FHCAPI_Controller extends Auth_Controller $error['messages'] = $data; else $error = $data; + } elseif (is_object($data)) { + $error = (array)$data; } else { $error['message'] = $data; } @@ -117,6 +119,9 @@ class FHCAPI_Controller extends Auth_Controller if ($type) $error['type'] = $type; + if (!isset($error['type'])) + $error['type'] = self::ERROR_TYPE_GENERAL; + $this->returnObj['errors'][] = $error; }