aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-04 19:15:01 -0700
committerfriendica <info@friendica.com>2014-09-04 19:15:01 -0700
commit1e5e70fcf4a223601db8f8973626cce1efd6bc28 (patch)
treeff58eab992a0d89fce963f3227a7b8ff42f60191 /include
parent955567fe5f517ec90623a4bf7f652fe2e02e1271 (diff)
downloadvolse-hubzilla-1e5e70fcf4a223601db8f8973626cce1efd6bc28.tar.gz
volse-hubzilla-1e5e70fcf4a223601db8f8973626cce1efd6bc28.tar.bz2
volse-hubzilla-1e5e70fcf4a223601db8f8973626cce1efd6bc28.zip
import_author_rss not succeeding, missing url
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php9
1 files 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'];