diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-15 10:20:20 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-15 10:20:20 +0200 |
| commit | de63e40a704761c2efd1e04e1313a37c43fef20e (patch) | |
| tree | 6ffc31006467c3c0d868ea55db919fb17fdd4278 /Zotlabs/Module | |
| parent | 803e85caeb959c730fcb69135aa2ccd55bea751b (diff) | |
| download | volse-hubzilla-de63e40a704761c2efd1e04e1313a37c43fef20e.tar.gz volse-hubzilla-de63e40a704761c2efd1e04e1313a37c43fef20e.tar.bz2 volse-hubzilla-de63e40a704761c2efd1e04e1313a37c43fef20e.zip | |
we must now provide the full path to the profile image for the cavatar plugin to work
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Chatsvc.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Photo.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index b4657e84d..d6708d95c 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -119,10 +119,10 @@ class Chatsvc extends \Zotlabs\Web\Controller { $rv['xchan_network'] = 'unknown'; $rv['xchan_url'] = z_root(); $rv['xchan_hidden'] = 1; - $rv['xchan_photo_mimetype'] = 'image/jpeg'; - $rv['xchan_photo_l'] = get_default_profile_photo(300); - $rv['xchan_photo_m'] = get_default_profile_photo(80); - $rv['xchan_photo_s'] = get_default_profile_photo(48); + $rv['xchan_photo_mimetype'] = 'image/png'; + $rv['xchan_photo_l'] = z_root() . '/' . get_default_profile_photo(300); + $rv['xchan_photo_m'] = z_root() . '/' . get_default_profile_photo(80); + $rv['xchan_photo_s'] = z_root() . '/' . get_default_profile_photo(48); } diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 9cafc8d07..ccc59ed09 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -31,7 +31,7 @@ class Photo extends \Zotlabs\Web\Controller { $observer_xchan = get_observer_hash(); - $default = get_default_profile_photo(); + $default = z_root() . '/' . get_default_profile_photo(); if(isset($type)) { @@ -45,11 +45,11 @@ class Photo extends \Zotlabs\Web\Controller { case 'm': $resolution = 5; - $default = get_default_profile_photo(80); + $default = z_root() . '/' . get_default_profile_photo(80); break; case 's': $resolution = 6; - $default = get_default_profile_photo(48); + $default = z_root() . '/' . get_default_profile_photo(48); break; case 'l': default: @@ -183,15 +183,15 @@ class Photo extends \Zotlabs\Web\Controller { switch($resolution) { case 4: - $data = file_get_contents(get_default_profile_photo()); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo()); $mimetype = 'image/png'; break; case 5: - $data = file_get_contents(get_default_profile_photo(80)); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo(80)); $mimetype = 'image/png'; break; case 6: - $data = file_get_contents(get_default_profile_photo(48)); + $data = file_get_contents(z_root() . '/' . get_default_profile_photo(48)); $mimetype = 'image/png'; break; default: diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 206b8c3d1..bb80adc41 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -401,7 +401,7 @@ class Ping extends \Zotlabs\Web\Controller { 'notify_link' => z_root() . '/admin/accounts', 'name' => $rr['account_email'], 'url' => '', - 'photo' => get_default_profile_photo(48), + 'photo' => z_root() . '/' . get_default_profile_photo(48), 'when' => relative_date($rr['account_created']), 'hclass' => ('notify-unseen'), 'message' => t('requires approval') |