aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-01 16:32:35 -0700
committerfriendica <info@friendica.com>2014-09-01 16:32:35 -0700
commita2146021f3218ae66d32d6a28f3a79a2d1cee6ac (patch)
tree7abeecbae30a8826d70fb5ae3bcdc2fc6946084a /include/network.php
parent46d96eff14c9d63fee2d0eff156050522b215ff7 (diff)
downloadvolse-hubzilla-a2146021f3218ae66d32d6a28f3a79a2d1cee6ac.tar.gz
volse-hubzilla-a2146021f3218ae66d32d6a28f3a79a2d1cee6ac.tar.bz2
volse-hubzilla-a2146021f3218ae66d32d6a28f3a79a2d1cee6ac.zip
use feed icon as default avatar for rss connections
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php
index 89bcbdc25..c44ed77c4 100644
--- a/include/network.php
+++ b/include/network.php
@@ -938,6 +938,9 @@ function discover_by_url($url,$arr = null) {
if($r)
return true;
+ if(! $photo)
+ $photo = z_root() . '/images/rss_icon.png';
+
$r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
dbesc($guid),
dbesc($guid),
@@ -950,9 +953,9 @@ function discover_by_url($url,$arr = null) {
dbesc(datetime_convert())
);
- $photos = import_profile_photo($photo,$profile);
+ $photos = import_profile_photo($photo,$guid);
$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1",
- dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
+ dbesc(datetime_convert()),
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),