Skip to content

T
TimeOutAdmin
Commit 82399eea by Tobin
Options

Merge branch 'revert-e2226904' into 'live_production'

Revert "Merge branch 'master' into 'live_production'" See merge request !72
parents e2226904 8c6dc18c
Showing with 6 additions and 6 deletions
application/controllers/Webservice.php
...@@ -104,17 +104,17 @@ class Webservice extends CI_Controller { ...@@ -104,17 +104,17 @@ class Webservice extends CI_Controller {
public function events_details($event_id = null) { public function events_details($event_id = null) {
$data['event_id'] = $_GET['event_id']; $data['event_id'] = $_GET['event_id'];
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$data['event_date_id'] = '';
if($data['event_id'] == null) { if($data['event_id'] == null) {
$this->errorResponse("ER16","Event id is null or empty");die; $this->errorResponse("ER16","Event id is null or empty");
} die;
if (isset($_GET['event_date_id']) && !empty($_GET['event_date_id'])){
$data['event_date_id'] = $_GET['event_date_id'];
} }
$res = $this->Webservice_model->event($data); $res = $this->Webservice_model->event($data);
if($res['status']!=0){ if($res['status']!=0){
$this->response($res['data']); $this->response($res['data']);
} else{ }
else{
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment