Commit 6b624687 by Tobin

Merge branch 'master' into 'dev_production'

Master See merge request !49
parents 0ce00f3a ff42dde9
...@@ -154,7 +154,7 @@ class Webservice extends CI_Controller { ...@@ -154,7 +154,7 @@ class Webservice extends CI_Controller {
public function get_category_list($query = null) { public function get_category_list($query = null) {
$data['query'] = $_GET['query']; $data['query'] = !empty($_GET['query']) ? $_GET['query'] : '';
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_category_list($data); $res = $this->Webservice_model->get_category_list($data);
if($res['status']!=0){ if($res['status']!=0){
......
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