diff options
author | Florian Pritz <bluewind@xinu.at> | 2013-08-14 17:06:07 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2013-09-02 22:02:27 +0200 |
commit | 84ce2c6ce0eb1b4f2f32c4ae0d7e08f3571f5018 (patch) | |
tree | 895a059bdc6d82a462a055764e761cdd16656a63 /application/controllers/user.php | |
parent | f8417cd3aa92f49cbe98188cd6fca2ec50da9613 (diff) |
Provide json output for api functions
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/user.php')
-rw-r--r-- | application/controllers/user.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/application/controllers/user.php b/application/controllers/user.php index 498a626d7..56f571d6a 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -8,6 +8,10 @@ */ class User extends MY_Controller { + protected $json_enabled_functions = array( + "apikeys", + ); + function __construct() { @@ -127,6 +131,10 @@ class User extends MY_Controller { WHERE `user` = ? order by created desc ", array($userid))->result_array(); + if (request_type() == "json") { + return send_json_reply($query); + } + $this->data["query"] = $query; $this->load->view('header', $this->data); |