Skip to content
Snippets Groups Projects
Commit 169ddc5b authored by Bart Visscher's avatar Bart Visscher
Browse files

Gallery: Only get local file when generating photo thumbnail

parent e137020f
Branches
No related tags found
No related merge requests found
...@@ -67,10 +67,6 @@ class OC_Gallery_Photo { ...@@ -67,10 +67,6 @@ class OC_Gallery_Photo {
} }
public static function getThumbnail($image_name) { public static function getThumbnail($image_name) {
$imagePath = OC_Filesystem::getLocalFile($image_name);
if(!file_exists($imagePath)) {
return null;
}
$save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/'; $save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/';
$save_dir .= dirname($image_name). '/'; $save_dir .= dirname($image_name). '/';
$image_name = basename($image_name); $image_name = basename($image_name);
...@@ -78,6 +74,10 @@ class OC_Gallery_Photo { ...@@ -78,6 +74,10 @@ class OC_Gallery_Photo {
if (file_exists($thumb_file)) { if (file_exists($thumb_file)) {
$image = new OC_Image($thumb_file); $image = new OC_Image($thumb_file);
} else { } else {
$imagePath = OC_Filesystem::getLocalFile($image_name);
if(!file_exists($imagePath)) {
return null;
}
$image = new OC_Image($imagePath); $image = new OC_Image($imagePath);
if ($image->valid()) { if ($image->valid()) {
$image->centerCrop(); $image->centerCrop();
...@@ -90,7 +90,6 @@ class OC_Gallery_Photo { ...@@ -90,7 +90,6 @@ class OC_Gallery_Photo {
} }
} }
if ($image->valid()) { if ($image->valid()) {
//var_dump($image, $image->resource());
return $image; return $image;
} }
return null; return null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment