diff options
| author | Max Kostikov <max@kostikov.co> | 2019-06-19 13:26:36 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-06-19 13:26:36 +0200 |
| commit | 2862b69d56d34c11baadab4f73fb3156bdeaf4d9 (patch) | |
| tree | d6052797858fcfa527a41796f4603dbeedb0a5f0 | |
| parent | 99a7cd3cfb3c8e59e4b18b562a69f113428cd5f2 (diff) | |
| parent | db8e46184bc6fae92d05a8992acab8c14e67aef1 (diff) | |
| download | volse-hubzilla-2862b69d56d34c11baadab4f73fb3156bdeaf4d9.tar.gz volse-hubzilla-2862b69d56d34c11baadab4f73fb3156bdeaf4d9.tar.bz2 volse-hubzilla-2862b69d56d34c11baadab4f73fb3156bdeaf4d9.zip | |
Merge branch 'dev' into 'dev'
Use html_entity_decode() for cached photo URL
See merge request hubzilla/core!1677
| -rw-r--r-- | Zotlabs/Module/Photo.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 0dc6d0194..a53b00282 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -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); |