diff options
| author | Max Kostikov <max@kostikov.co> | 2021-01-23 20:47:06 +0000 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-01-23 20:47:06 +0000 |
| commit | a53f2864677ce769435058301f5601bf86aaa6fa (patch) | |
| tree | 311bc2f49a58d9f3815c347c85feeda412e9ce72 | |
| parent | e4ed5ed264bf660b893e18d85775f9b08c133564 (diff) | |
| parent | 74441f2f00fe1a8be4930879822fb6ef6040896c (diff) | |
| download | volse-hubzilla-a53f2864677ce769435058301f5601bf86aaa6fa.tar.gz volse-hubzilla-a53f2864677ce769435058301f5601bf86aaa6fa.tar.bz2 volse-hubzilla-a53f2864677ce769435058301f5601bf86aaa6fa.zip | |
Merge branch 'dev' into 'dev'
Don't fetch profile photos from own hub
See merge request hubzilla/core!1896
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 150a6af03..ee1f54ec8 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -795,7 +795,10 @@ class Libzot { dbesc($xchan_hash) ); if ($local) { - $ph = z_fetch_url($arr['photo']['url'], true); + + $ph = false; + if (strpos($arr['photo']['url'], z_root()) === false) + $ph = z_fetch_url($arr['photo']['url'], true); if ($ph['success']) { $hash = import_channel_photo($ph['body'], $arr['photo']['type'], $local[0]['channel_account_id'], $local[0]['channel_id']); |