diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
| commit | d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653 (patch) | |
| tree | 20c715f196dbbca6cc8b54d426ca98ac3d1792d1 /include/items.php | |
| parent | 52e38d7c24d9e2517e4691a0f2548a695e7806da (diff) | |
| parent | 13546167877322afa274a2540656f525e55d3b48 (diff) | |
| download | volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.gz volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.bz2 volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 57a7774fd..71d4213b7 100755 --- a/include/items.php +++ b/include/items.php @@ -4389,8 +4389,6 @@ function zot_feed($uid,$observer_hash,$arr) { $mindate = null; $message_id = null; - require_once('include/security.php'); - if(array_key_exists('mindate',$arr)) { $mindate = datetime_convert('UTC','UTC',$arr['mindate']); } @@ -4404,7 +4402,7 @@ function zot_feed($uid,$observer_hash,$arr) { $mindate = dbesc($mindate); - logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_xchan, LOGGER_DEBUG); + logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_hash, LOGGER_DEBUG); if($message_id) logger('message_id: ' . $message_id,LOGGER_DEBUG); |