png support for embedded private photos
This commit is contained in:
parent
67d8afb9d1
commit
ba2452a076
3 changed files with 4 additions and 4 deletions
|
@ -2952,7 +2952,7 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
|
||||||
if(stristr($image , $site . '/photo/')) {
|
if(stristr($image , $site . '/photo/')) {
|
||||||
$replace = false;
|
$replace = false;
|
||||||
$i = basename($image);
|
$i = basename($image);
|
||||||
$i = str_replace('.jpg','',$i);
|
$i = str_replace(array('.jpg','.png'),array('',''),$i);
|
||||||
$x = strpos($i,'-');
|
$x = strpos($i,'-');
|
||||||
if($x) {
|
if($x) {
|
||||||
$res = substr($i,$x+1);
|
$res = substr($i,$x+1);
|
||||||
|
@ -2994,7 +2994,7 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
|
||||||
}
|
}
|
||||||
if($replace) {
|
if($replace) {
|
||||||
logger('fix_private_photos: replacing photo', LOGGER_DEBUG);
|
logger('fix_private_photos: replacing photo', LOGGER_DEBUG);
|
||||||
$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
|
$s = str_replace($image, 'data:' . $r[0]['type'] . ';base64,' . base64_encode($r[0]['data']), $s);
|
||||||
logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
|
logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ function msearch_post(&$a) {
|
||||||
$results[] = array(
|
$results[] = array(
|
||||||
'name' => $rr['name'],
|
'name' => $rr['name'],
|
||||||
'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'],
|
'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'],
|
||||||
'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . 'jpg',
|
'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
|
||||||
'tags' => str_replace(array(',',' '),array(' ',' '),$rr['pub_keywords'])
|
'tags' => str_replace(array(',',' '),array(' ',' '),$rr['pub_keywords'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,7 @@ function photo_init(&$a) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$uid = str_replace('.jpg', '', $person);
|
$uid = str_replace(array('.jpg','.png'),array('',''), $person);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
|
$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
|
||||||
intval($resolution),
|
intval($resolution),
|
||||||
|
|
Loading…
Reference in a new issue