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 /mod/zotfeed.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 'mod/zotfeed.php')
| -rw-r--r-- | mod/zotfeed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/zotfeed.php b/mod/zotfeed.php index 480e886cd..c730e4162 100644 --- a/mod/zotfeed.php +++ b/mod/zotfeed.php @@ -38,7 +38,7 @@ function zotfeed_init(&$a) { logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG); - $result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],$mindate); + $result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate)); $result['success'] = true; json_return_and_die($result); |