aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-24 15:50:05 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-24 15:50:05 -0700
commit851f2f64df284d4ec410cdf7511b365db9fc5e9b (patch)
tree81484c475285226961b51240dd071197b7021791 /include/items.php
parent5795e2a58bb4a0702a3d318ec6ac05681d6e5864 (diff)
parent13546167877322afa274a2540656f525e55d3b48 (diff)
downloadvolse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.tar.gz
volse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.tar.bz2
volse-hubzilla-851f2f64df284d4ec410cdf7511b365db9fc5e9b.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: index.php mod/setup.php
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php
index 828f43621..cc777788c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -954,7 +954,7 @@ function import_author_diaspora($x) {
);
if($r) {
logger('in_cache: ' . $x['address'], LOGGER_DATA);
- return $r[0]['chan_hash'];
+ return $r[0]['xchan_hash'];
}
if(discover_by_webbie($x['address'])) {
@@ -4349,8 +4349,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']);
}
@@ -4364,7 +4362,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);