aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-23 20:01:39 -0700
committerzotlabs <mike@macgirvin.com>2016-10-23 20:01:39 -0700
commit06bbf494bb0da1812c7fda0dcea5e8132e4e009f (patch)
tree6c5bc91b95f74c41120c5f7d3ea2f4ce9cc6a346
parent21b919a76b4bf229985f5ce3973590e95c8bc1bb (diff)
downloadvolse-hubzilla-06bbf494bb0da1812c7fda0dcea5e8132e4e009f.tar.gz
volse-hubzilla-06bbf494bb0da1812c7fda0dcea5e8132e4e009f.tar.bz2
volse-hubzilla-06bbf494bb0da1812c7fda0dcea5e8132e4e009f.zip
profile photo issue on postgres
-rw-r--r--Zotlabs/Module/Profile_photo.php2
-rw-r--r--include/photos.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 231b80bcf..5b88f67f5 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -243,7 +243,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
}
}
- $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata);
+ $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
$ph = photo_factory($imagedata, $filetype);
if(! $ph->is_valid()) {
diff --git a/include/photos.php b/include/photos.php
index e8f46048c..5e4d755e3 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -28,7 +28,8 @@ function photo_upload($channel, $observer, $args) {
return $ret;
}
-// call_hooks('photo_upload_begin', $args);
+
+//call_hooks('photo_upload_begin', $args);
/*
* Determine the album to use