diff options
| author | zotlabs <mike@macgirvin.com> | 2019-04-18 13:58:43 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-04-18 13:58:43 -0700 |
| commit | 66479e2aa75d10fc509f9cde1a53c08037aab940 (patch) | |
| tree | 916165bd394b9d4d33a6cbf2962b18c49a3a33ed /Zotlabs | |
| parent | 6feddcbced5c26f18216063efda5967e706748b7 (diff) | |
| parent | 6c93518ef733a28ef06451193fbad8d964ac4127 (diff) | |
| download | volse-hubzilla-66479e2aa75d10fc509f9cde1a53c08037aab940.tar.gz volse-hubzilla-66479e2aa75d10fc509f9cde1a53c08037aab940.tar.bz2 volse-hubzilla-66479e2aa75d10fc509f9cde1a53c08037aab940.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
| -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 6912322aa..37ae03460 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -83,7 +83,7 @@ class Photo extends \Zotlabs\Web\Controller { $modified = strtotime($r[0]['edited'] . "Z"); $mimetype = $r[0]['mimetype']; if(intval($r[0]['os_storage'])) - $data = file_get_contents($data); + $data = file_get_contents(dbunescbin($r[0]['content'])); else $data = dbunescbin($r[0]['content']); } |