aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKlaus <Klaus.Weidenbach@gmx.net>2015-05-24 03:12:25 +0200
committerKlaus <Klaus.Weidenbach@gmx.net>2015-05-24 03:12:25 +0200
commit1ce3d01bb8bf3843f5ccc54ce0e10b2730404d8e (patch)
tree5d31a5279f8bf7ab96139150b00472fadbc91735 /include
parent7f9e4d6add614563242db41e2fe2eee371c7a35f (diff)
parent760f17b17389eafafcb1ce2e3a031c19932cff7f (diff)
downloadvolse-hubzilla-1ce3d01bb8bf3843f5ccc54ce0e10b2730404d8e.tar.gz
volse-hubzilla-1ce3d01bb8bf3843f5ccc54ce0e10b2730404d8e.tar.bz2
volse-hubzilla-1ce3d01bb8bf3843f5ccc54ce0e10b2730404d8e.zip
Merge pull request #332 from solstag/zotfeedcleanup
Import security only when necessary, use correct variable in log
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php4
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);