From a2e1edded5350de13bf1083bde4e26698a29fd5b Mon Sep 17 00:00:00 2001
From: velocity37 <velocity37@gmail.com>
Date: Tue, 21 Aug 2012 18:51:20 -0700
Subject: [PATCH] Actually use thumb_convert_path

The check would always fail even on Windows, resulting in thumb_convert_path never being used. See:
https://github.com/shish/shimmie2/issues/254
---
 ext/handle_pixel/main.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 9546699a..cb330076 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -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:";