summaryrefslogtreecommitdiffstats
path: root/lib/image.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/image.php')
-rw-r--r--lib/image.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/image.php b/lib/image.php
index 41e8c744d8c..d72960101f0 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -409,12 +409,7 @@ class OC_Image {
default:
// this is mostly file created from encrypted file
- $datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
- $newimgpath = $imagepath;
- if (strncmp($newimgpath, $datadir, strlen($datadir)) == 0) {
- $newimgpath = substr($imagepath, strlen($datadir));
- }
- $this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents($newimgpath));
+ $this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($newimgpath)));
$itype = IMAGETYPE_PNG;
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
break;