aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Photo.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
committerMario Vavti <mario@mariovavti.com>2019-08-13 09:46:01 +0200
commite8f3b7f8530c69045dcabffecab2f158d0b35214 (patch)
treee02872bbb9a7226f30f78a1784fae113431eceaa /Zotlabs/Module/Photo.php
parent892e9cd835612c8155bf3c15436137f94abbb667 (diff)
parente28341ca4beb1b746a5c17590f62c02cc8df49ba (diff)
downloadvolse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.gz
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.bz2
volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.zip
Merge branch '4.4RC'4.4
Diffstat (limited to 'Zotlabs/Module/Photo.php')
-rw-r--r--Zotlabs/Module/Photo.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 0dc6d0194..59dc709e1 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);
@@ -222,7 +222,7 @@ class Photo extends \Zotlabs\Web\Controller {
if(! $data)
killme();
- $etag = md5($data . $modified);
+ $etag = '"' . md5($data . $modified) . '"';
if($modified == 0)
$modified = time();