From 0a9b2b6b15bcf3f3b2fe604defd0cd99934f992b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 29 Oct 2015 11:29:11 +0100 Subject: possibly better fox for profil photo image type issue --- include/photo/photo_driver.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include') diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 810e0cdc7..f9b6e5ea8 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -593,11 +593,6 @@ function import_xchan_photo($photo,$xchan,$thing = false) { if($photo) { $filename = basename($photo); - $type = guess_image_type($photo); - - if(! $type) - $type = 'image/jpeg'; - $result = z_fetch_url($photo,true); @@ -614,6 +609,7 @@ function import_xchan_photo($photo,$xchan,$thing = false) { } } } + $type = guess_image_type($photo, $result['header']); } } else { -- cgit v1.2.3 From d66be62516c1297135d707f0d565e100651529d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 29 Oct 2015 11:34:30 +0100 Subject: move it up --- include/photo/photo_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index f9b6e5ea8..e980a96e1 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -598,6 +598,7 @@ function import_xchan_photo($photo,$xchan,$thing = false) { if($result['success']) { $img_str = $result['body']; + $type = guess_image_type($photo, $result['header']); $h = explode("\n",$result['header']); if($h) { @@ -609,7 +610,6 @@ function import_xchan_photo($photo,$xchan,$thing = false) { } } } - $type = guess_image_type($photo, $result['header']); } } else { -- cgit v1.2.3 From ec28dee728b847f2363a53fb11e003d818c8e1cb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 29 Oct 2015 12:58:32 +0100 Subject: update to latest object --- include/bb2diaspora.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d10ed57eb..7cba40672 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -309,9 +309,8 @@ function bb2diaspora_itembody($item, $force_update = false) { $is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false); if($is_photo) { $object = json_decode($item['object'],true); - if($object['link'][2]) { - $photo_bb = '[zrl=' . rawurldecode($object['id']) . ']' . '[zmg=' . $object['link'][2]['width'] . 'x' . $object['link'][2]['height'] . ']' . rawurldecode($object['link'][2]['href']) . '[/zmg]' . '[/zrl]'; - $item['body'] = (($item['body']) ? $photo_bb . $item['body'] : $photo_bb); + if($object['bbcode']) { + $item['body'] = (($item['body']) ? $object['bbcode'] . "\r\n" . $item['body'] : $object['bbcode']); } } -- cgit v1.2.3