james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Actually use thumb_convert_path

Browse Source 
The check would always fail even on Windows, resulting in thumb_convert_path never being used. See:
https://github.com/shish/shimmie2/issues/254
This commit is contained in:
velocity37 2012-08-21 18:51:20 -07:00
parent 10fadb27d1
commit a2e1edded5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/handle_pixel/main.php
View File

@ -90,14 +90,7 @@ class PixelFileHandler extends DataHandlerExtension {
$w = $config->get_int("thumb_width");
$h = $config->get_int("thumb_height");
$q = $config->get_int("thumb_quality");
// Windows is a special case
if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {
$convert = $config->get_string("thumb_convert_path");
}
else {
$convert = "convert";
}
$convert = $config->get_string("thumb_convert_path");
// ffff imagemagic fails sometimes, not sure why
//$format = "'%s' '%s[0]' -format '%%[fx:w] %%[fx:h]' info:";