better job catching no settings

diff --git a/actions/upload.php b/actions/upload.php
index 65005671af0a1e369226c00305737c1f9d373dfb..f062edc8017c609f3f801482ba613a5d274c354e 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -30,7 +30,7 @@
 \r
        $image_lib = get_plugin_setting('image_lib', 'tidypics');\r
        if (!$image_lib)\r
-               $image_lib = 'GD';\r
+               $image_lib = "GD";\r
 \r
        // post limit exceeded\r
        if (count($_FILES) == 0) {\r
@@ -153,29 +153,30 @@
                }\r
                \r
 \r
-               if ($image_lib == 'GD') {\r
-\r
-                       if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {\r
-                               trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);\r
-                       }\r
+               if ($image_lib == 'ImageMagick') { // ImageMagick command line\r
                        \r
-               } else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP \r
-\r
-                       if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {\r
-                               trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);\r
-                       }\r
-\r
-               } else { // ImageMagick command line\r
-\r
                        $thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename);\r
                        if(!count($thumbs)) {\r
-                               trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);\r
+                               trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);\r
                        }\r
-\r
+                       \r
                        $album = get_entity($container_guid);\r
                        \r
                        tp_watermark($thumbs);\r
                        \r
+                       \r
+               } else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP \r
+                       \r
+                       if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {\r
+                               trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);\r
+                       }\r
+               \r
+               } else { \r
+                       \r
+                       if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {\r
+                               trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);\r
+                       }\r
+                       \r
                } // end of image library selector\r
 \r
                //keep one file handy so we can add a notice to the river if single image option selected\r

diff --git a/lib/resize.php b/lib/resize.php
index 7c06b28c5f2de1e71e19fdfa648c88f6b83717c1..8561e1f4a8f171b1ebb7b5031db5fe23318cd120 100644 (file)
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -20,6 +20,7 @@
                $image_sizes = get_plugin_setting('image_sizes', 'tidypics');\r
                if (!$image_sizes) {\r
                        register_error(elgg_echo('tidypics:nosettings'));\r
+                       forward($_SERVER['HTTP_REFERER']);\r
                        return false;\r
                }\r
                $image_sizes = unserialize($image_sizes);\r