diff options
| author | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
| commit | 51156d058232969d55032f045859e46bb3a09162 (patch) | |
| tree | 4f2dea61bdc49be73de4ae00fc4e22937361df3e /Zotlabs/Module/Setup.php | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| parent | ea9925f489602529891c0ed468cf35117e7ef454 (diff) | |
| download | volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.gz volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.bz2 volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.zip | |
Merge branch 'dev' into 'dev'
misc fixes
See merge request hubzilla/core!1558
Diffstat (limited to 'Zotlabs/Module/Setup.php')
| -rw-r--r-- | Zotlabs/Module/Setup.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index ce0538099..c809ff5ec 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -732,6 +732,12 @@ class Setup extends \Zotlabs\Web\Controller { // install the standard theme set_config('system', 'allowed_themes', 'redbasic'); + // if imagick converter is installed, use it + if(@is_executable('/usr/bin/convert')) { + set_config('system','imagick_convert_path','/usr/bin/convert'); + } + + // Set a lenient list of ciphers if using openssl. Other ssl engines // (e.g. NSS used in RedHat) require different syntax, so hopefully // the default curl cipher list will work for most sites. If not, |