wrong variable for image magick path

diff --git a/lib/resize.php b/lib/resize.php
index a2c522eb8f6be32cae45b0b3a61f344f2c657d94..a346fc272d69a4282db9f6a2c3eac35c3e43296d 100644 (file)
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -521,7 +521,7 @@
                                        $newheight = $maxheight;\r
                                        $newwidth = $maxwidth;\r
                                }\r
-                               $im_path = get_plugin_setting('convert_command', 'tidypics');\r
+                               $im_path = get_plugin_setting('im_path', 'tidypics');\r
                                if(!$im_path) {\r
                                        $im_path = "/usr/bin/";\r
                                }\r

diff --git a/lib/watermark.php b/lib/watermark.php
index 330ae7b29a026bfd72bb9ffc4ac40bcbef28c1bd..095b10eac607269522d615819044145a8e1bf092 100644 (file)
--- 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/";
        }