From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 12 Jul 2009 00:09:08 +0000 (+0000)
Subject: wrong variable for image magick path
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b2bd7496baa3d2261233451627e0331fcb4d3fc3;p=lorea%2Felgg.git

wrong variable for image magick path
---

diff --git a/lib/resize.php b/lib/resize.php
index a2c522eb8..a346fc272 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -521,7 +521,7 @@
 					$newheight = $maxheight;
 					$newwidth = $maxwidth;
 				}
-				$im_path = get_plugin_setting('convert_command', 'tidypics');
+				$im_path = get_plugin_setting('im_path', 'tidypics');
 				if(!$im_path) {
 					$im_path = "/usr/bin/";
 				}
diff --git a/lib/watermark.php b/lib/watermark.php
index 330ae7b29..095b10eac 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -7,7 +7,7 @@ function tp_watermark($thumbs) {
 	$user = get_user_entity_as_row($album->owner_guid);
 	$username = $user->username;
 
-	$im_path = get_plugin_setting('convert_command', 'tidypics');
+	$im_path = get_plugin_setting('im_path', 'tidypics');
 	if(!$im_path) {
 		$im_path = "/usr/bin/";
 	}