harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	index.php
	mod/setup.php
This commit is contained in:
redmatrix
2015-05-24 15:50:05 -07:00
parent 5795e2a58b 1354616787
commit 851f2f64df
29 changed files with 19946 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@@ -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);