diff options
| author | zotlabs <mike@macgirvin.com> | 2019-04-16 18:34:41 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-04-16 18:34:41 -0700 |
| commit | a22ecd42ed2ba1d5fff739906daf33faecf14624 (patch) | |
| tree | b2d171a51df1352f2fac86b903012a7f046cb967 /Zotlabs/Module | |
| parent | f7b281a65f914cae8611c3e4c9befcc2a20a057a (diff) | |
| parent | b7cb2a295148f64ad56a3d428f7a781a232601fd (diff) | |
| download | volse-hubzilla-a22ecd42ed2ba1d5fff739906daf33faecf14624.tar.gz volse-hubzilla-a22ecd42ed2ba1d5fff739906daf33faecf14624.tar.bz2 volse-hubzilla-a22ecd42ed2ba1d5fff739906daf33faecf14624.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module')
| -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']); } |