we must now provide the full path to the profile image for the cavatar plugin to work

4 files changed, 15 insertions, 15 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')
diff --git a/include/security.php b/include/security.php
index 19278d5cb..88988a7c0 100644
--- a/include/security.php
+++ b/include/security.php
@@ -118,10 +118,10 @@ function atoken_xchan($atoken) {
 			'xchan_network' => 'unknown',
 			'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'],
 			'xchan_hidden' => 1,
-			'xchan_photo_mimetype' => 'image/jpeg',
-			'xchan_photo_l' => get_default_profile_photo(300),
-			'xchan_photo_m' => get_default_profile_photo(80),
-			'xchan_photo_s' => get_default_profile_photo(48)
+			'xchan_photo_mimetype' => 'image/png',
+			'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(300),
+			'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80),
+			'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48)
 		];
 	}