From 1e5e70fcf4a223601db8f8973626cce1efd6bc28 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 19:15:01 -0700 Subject: import_author_rss not succeeding, missing url --- include/items.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index c96a5e4ed..44d4abdf8 100755 --- a/include/items.php +++ b/include/items.php @@ -910,9 +910,10 @@ function import_author_rss($x) { } $name = trim($x['name']); - $r = q("insert into xchan ( xchan_hash, xchan_url, xchan_name, xchan_network ) - values ( '%s', '%s', '%s', '%s' )", - dbesc($x['url']), + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_url, xchan_name, xchan_network ) + values ( '%s', '%s', '%s', '%s', '%s' )", + dbesc($x['guid']), + dbesc($x['guid']), dbesc($x['url']), dbesc(($name) ? $name : t('(Unknown)')), dbesc('rss') @@ -1068,7 +1069,7 @@ function encode_item_xchan($xchan) { $ret = array(); $ret['name'] = $xchan['xchan_name']; $ret['address'] = $xchan['xchan_addr']; - $ret['url'] = $xchan['hubloc_url']; + $ret['url'] = (($xchan['hubloc_url']) ? $xchan['hubloc_url'] : $xchan['xchan_url']); $ret['network'] = $xchan['xchan_network']; $ret['photo'] = array('mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m']); $ret['guid'] = $xchan['xchan_guid']; -- cgit v1.2.3