diff options
author | zotlabs <mike@macgirvin.com> | 2016-10-23 17:49:15 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2016-10-23 17:49:15 -0700 |
commit | 8d52a278a964de86f2159441ed0cffe3add0d916 (patch) | |
tree | 5037abae57c01c7ff9f53e760314bb552d2b7773 /Zotlabs/Module/Cover_photo.php | |
parent | d30892ea601e9131c6dc3b25aeee1f258f72a104 (diff) | |
parent | 5fbba27d17c78081e784fc2f8e9bb1907b79b4b7 (diff) | |
download | volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.gz volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.bz2 volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.zip |
Merge branch 'dev' into pdo
Diffstat (limited to 'Zotlabs/Module/Cover_photo.php')
-rw-r--r-- | Zotlabs/Module/Cover_photo.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 7c8e1323c..72ec1020d 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -88,7 +88,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { if($r) { $base_image = $r[0]; - $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['content']) : dbunescbin($base_image['content'])); + $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); $im = photo_factory($base_image['content'], $base_image['mimetype']); if($im->is_valid()) { @@ -320,7 +320,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { } if(intval($r[0]['os_storage'])) - $data = @file_get_contents($r[0]['content']); + $data = @file_get_contents(dbunescbin($r[0]['content'])); else $data = dbunescbin($r[0]['content']); |