summaryrefslogtreecommitdiffstats
path: root/application/controllers/user.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-09-03 15:49:46 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-09-03 15:49:46 +0200
commit26e2f14fb02bc6dd3df3e516f57a51b628a2e4c2 (patch)
tree8d6c7b87844b1319adab7f25d7ef5c7c51e0e513 /application/controllers/user.php
parentfbd587a62dc1d84e4ebf3917ecdb86270ea8a48d (diff)
parent69e0cba93445496e7b045b54ecefe8243276fd50 (diff)
Merge branch 'working'
Diffstat (limited to 'application/controllers/user.php')
-rw-r--r--application/controllers/user.php8
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);