diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-06 12:24:26 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-06 12:24:26 -0800 |
| commit | ba2d0fae0e339e4909a7ee11c8493cdffbc6c392 (patch) | |
| tree | 7f796cc33c96c68039b034c78c26789cf3d8b75e /Zotlabs | |
| parent | 1ce8168d72b4bcb8a4373a6a6a4428db62a4aa3f (diff) | |
| parent | 7f9e91f1c78f9df6375a5ae5cb38b09eea02312b (diff) | |
| download | volse-hubzilla-ba2d0fae0e339e4909a7ee11c8493cdffbc6c392.tar.gz volse-hubzilla-ba2d0fae0e339e4909a7ee11c8493cdffbc6c392.tar.bz2 volse-hubzilla-ba2d0fae0e339e4909a7ee11c8493cdffbc6c392.zip | |
Merge branch 'dev' into gnusoc
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Editpost.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Setup.php | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 5c04653b8..d7612b165 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -78,6 +78,7 @@ class Editpost extends \Zotlabs\Web\Controller { $x = array( 'nickname' => $channel['channel_address'], + 'item' => $itm[0], 'editor_autocomplete'=> true, 'bbco_autocomplete'=> 'bbcode', 'return_path' => $_SESSION['return_url'], diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index b5258a28f..9c688af01 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -496,6 +496,11 @@ class Setup extends \Zotlabs\Web\Controller { function check_funcs(&$checks) { $ck_funcs = array(); + $disabled = explode(',',ini_get('disable_functions')); + if($disabled) + array_walk($disabled,'array_trim'); + + // add check metadata, the real check is done bit later and return values set $this->check_add($ck_funcs, t('libCurl PHP module'), true, true); $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true); @@ -511,13 +516,13 @@ class Setup extends \Zotlabs\Web\Controller { $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true); } } - if((! function_exists('exec')) || strstr(ini_get('disable_functions'),'exec')) { + if((! function_exists('exec')) || in_array('exec',$disabled)) { $this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini')); } else { $this->check_add($ck_funcs, t('exec'), true, true); } - if((! function_exists('shell_exec')) || strstr(ini_get('disable_functions'),'shell_exec')) { + if((! function_exists('shell_exec')) || in_array('shell_exec',$disabled)) { $this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini')); } else { |