diff options
| -rw-r--r-- | lib/filesystem.php | 14 | ||||
| -rw-r--r-- | lib/image.php | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php index 337b0f1464b..454bb1aa81a 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -344,6 +344,20 @@ class OC_Filesystem{ } /** + * return path to file which reflects one visible in browser + * @param string path + * @return string + */ + static public function getLocalPath($path) { + $datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files'; + $newpath = $path; + if (strncmp($newpath, $datadir, strlen($datadir)) == 0) { + $newpath = substr($path, strlen($datadir)); + } + return $newpath; + } + + /** * check if the requested path is valid * @param string path * @return bool 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; |