From b2bd7496baa3d2261233451627e0331fcb4d3fc3 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 12 Jul 2009 00:09:08 +0000 Subject: wrong variable for image magick path --- lib/resize.php | 2 +- lib/watermark.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/"; } -- cgit v1.2.3