Merge branch 'master' into 'uat_staging'

application/models/Webservice_model.php

@@ -1700,6 +1700,7 @@ class Webservice_model extends CI_Model {
 						  	ORDER BY EVT.event_id DESC
 						  	LIMIT $limit";
 
+				  	$resp = array();
 				  	$result = $this->db->query($sql)->result();
 				  	foreach ($result AS $key => $rs) {
 					  	if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
@@ -1718,8 +1719,9 @@ class Webservice_model extends CI_Model {
 							unset($result[$key]);
 						}
 						unset($result[$key]->date_time);
+						$resp[] = $result[$key];
 					}
-					$res = array('status'=>1,'data'=>array('events'=>$result,'meta'=>$meta));
+					$res = array('status'=>1,'data'=>array('events'=>$resp,'meta'=>$meta));
 			    } else {
 					$res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));
 		 		}