Merge branch 'dev' into 'dev'

Use html_entity_decode() for cached photo URL

See merge request hubzilla/core!1677
This commit is contained in:
Max Kostikov 2019-06-19 13:26:36 +02:00
commit 2862b69d56

View File

@ -169,7 +169,7 @@ class Photo extends \Zotlabs\Web\Controller {
);
call_hooks('cache_url_hook', $cache);
if(! $cache['status']) {
$url = htmlspecialchars_decode($r[0]['display_path']);
$url = html_entity_decode($r[0]['display_path'], ENT_QUOTES);
// SSLify if needed
if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);