diff options
| author | Max Kostikov <max@kostikov.co> | 2019-04-16 22:26:53 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-04-16 22:26:53 +0200 |
| commit | b7cb2a295148f64ad56a3d428f7a781a232601fd (patch) | |
| tree | 26608e1daba8be0c87f3f701e96a7512420e8141 /Zotlabs | |
| parent | 5a9c8a9343330a4f7b6249582997bec2acfc121a (diff) | |
| parent | c4909703243297e49cbb1e37cc16e88b499835a4 (diff) | |
| download | volse-hubzilla-b7cb2a295148f64ad56a3d428f7a781a232601fd.tar.gz volse-hubzilla-b7cb2a295148f64ad56a3d428f7a781a232601fd.tar.bz2 volse-hubzilla-b7cb2a295148f64ad56a3d428f7a781a232601fd.zip | |
Merge branch 'dev' into 'dev'
Fix file path with filesystem storage
See merge request hubzilla/core!1595
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']); } |