diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
| commit | adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936 (patch) | |
| tree | 2d5e256b6bb001397939debad609789367745fc9 /include/network.php | |
| parent | 2ce1e3678acd59409f1013433db99df6624c2895 (diff) | |
| parent | f3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff) | |
| download | volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.gz volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.bz2 volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index ef92e0132..75729d6e4 100644 --- a/include/network.php +++ b/include/network.php @@ -1035,7 +1035,7 @@ function discover_by_url($url,$arr = null) { dbesc(datetime_convert()) ); - $photos = import_profile_photo($photo,$guid); + $photos = import_xchan_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'", dbesc(datetime_convert()), dbesc($photos[0]), @@ -1192,7 +1192,7 @@ function discover_by_webbie($webbie) { dbescdate(datetime_convert()) ); } - $photos = import_profile_photo($vcard['photo'],$addr); + $photos = import_xchan_photo($vcard['photo'],$addr); $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'", dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])), dbesc($photos[0]), |