diff options
| author | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-09 15:12:28 +0200 |
|---|---|---|
| committer | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-09 15:12:50 +0200 |
| commit | 001293a702be1373c327bc8d5222df3924a7f66a (patch) | |
| tree | e26d352ef9b8b7ea5a6ad0bd0108c0b608e46a09 /lib/image.php | |
| parent | cfe219fbb9f2f734b063041ae420400044f90000 (diff) | |
| download | nextcloud-server-001293a702be1373c327bc8d5222df3924a7f66a.tar.gz nextcloud-server-001293a702be1373c327bc8d5222df3924a7f66a.zip | |
removing app access check, fix title for links in tiles
Diffstat (limited to 'lib/image.php')
| -rw-r--r-- | lib/image.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/image.php b/lib/image.php index af61f9424e9..5a2e8202488 100644 --- a/lib/image.php +++ b/lib/image.php @@ -407,7 +407,11 @@ class OC_Image { break; */ default: - $this->resource = imagecreatefromstring(file_get_contents($imagepath)); + error_log($imagepath); + error_log(\OC_Filesystem::getInternalPath($imagepath)); + error_log(\OC_Filesystem::getLocalFile($imagepath)); + // this is mostly file created from encrypted file + $this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getInternalPath($imagepath))); $itype = IMAGETYPE_PNG; OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG); break; |