diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 1cdd78557..7cbc3f45f 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -122,6 +122,15 @@ class Item extends \Zotlabs\Web\Controller { killme(); } + + if(argc() > 1 && argv(1) !== 'drop') { + $x = q("select plink from item where mid = '%s' limit 1", + dbesc(z_root() . '/item/' . argv(1)) + ); + if($x) { + goaway($x[0]['plink']); + } + } } diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 1eb0ba423..1fd1df854 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -531,7 +531,7 @@ class Setup extends \Zotlabs\Web\Controller { $ck_funcs[0]['status'] = false; $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); } - if((! function_exists('imagecreatefromjpeg')) || (! class_exists('\\Imagick'))) { + if((! function_exists('imagecreatefromjpeg')) && (! class_exists('\\Imagick'))) { $ck_funcs[1]['status'] = false; $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'); }