diff options
| author | Cash Costello <cash.costello@gmail.com> | 2009-07-12 00:09:08 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2009-07-12 00:09:08 +0000 |
| commit | b2bd7496baa3d2261233451627e0331fcb4d3fc3 (patch) | |
| tree | e1f8894fdd3bb839fc2e356c7cce10c417542b9f | |
| parent | 4316b94d5448c0127fe6bc42ca5dcbacd7b9d563 (diff) | |
| download | elgg-b2bd7496baa3d2261233451627e0331fcb4d3fc3.tar.gz elgg-b2bd7496baa3d2261233451627e0331fcb4d3fc3.tar.bz2 | |
wrong variable for image magick path
| -rw-r--r-- | lib/resize.php | 2 | ||||
| -rw-r--r-- | 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/"; } |