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-10 13:18:55 +0200 |
| commit | 7ee722e0dafbd9e0b38014e063ec3c425368d2e7 (patch) | |
| tree | eaef70aa135708e734cd28d862e8503d6196f37f /lib | |
| parent | e073cd756cc2c1485292fa78884ad237a5aa8160 (diff) | |
| download | nextcloud-server-7ee722e0dafbd9e0b38014e063ec3c425368d2e7.tar.gz nextcloud-server-7ee722e0dafbd9e0b38014e063ec3c425368d2e7.zip | |
removing app access check, fix title for links in tiles
Diffstat (limited to 'lib')
| -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 3150631cc34..f4c944e10d6 100644 --- a/lib/image.php +++ b/lib/image.php @@ -400,7 +400,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; |