diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /include/api.php | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/api.php b/include/api.php index 8b52253dd..9fe2ef47d 100644 --- a/include/api.php +++ b/include/api.php @@ -621,7 +621,19 @@ require_once('include/items.php'); api_register_func('api/red/group','api_group', true); + function api_red_xchan(&$a,$type) { + if(api_user() === false) + return false; + require_once('include/hubloc.php'); + if($_SERVER['request_method'] === 'POST') { + $r = xchan_store($_REQUEST); + } + $r = xchan_fetch($_REQUEST); + json_return_and_die($r); + }; + api_register_func('api/red/xchan','api_red_xchan',true); + function api_statuses_mediap(&$a, $type) { if (api_user() === false) { |