Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 07:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev

Browse source
This commit is contained in:
Mike Macgirvin 2018-09-20 12:36:29 +10:00
commit 529171de8f
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Zotlabs/Module/Item.php
View file

@ -122,6 +122,15 @@ class Item extends \Zotlabs\Web\Controller {
killme(); 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']);
}
}
} }

2
Zotlabs/Module/Setup.php
View file

@ -531,7 +531,7 @@ class Setup extends \Zotlabs\Web\Controller {
$ck_funcs[0]['status'] = false; $ck_funcs[0]['status'] = false;
$ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.'); $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.');
} }