diff options
author | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
commit | 15ce8bc79b219e10f709796c09c739649a8df53b (patch) | |
tree | edd456a39ad0daf12d6cc4409a99477f4fb38d82 /Zotlabs/Module/Setup.php | |
parent | 8d70b919551f6f6462e639f7cfffda9825344e43 (diff) | |
parent | d190b1995b0886b430beb5dac1a1e72582b9ad2b (diff) | |
download | volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.gz volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.bz2 volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Setup.php')
-rw-r--r-- | Zotlabs/Module/Setup.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index c0716ca7c..370b7b9f8 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -441,13 +441,18 @@ class Setup extends \Zotlabs\Web\Controller { require_once 'include/environment.php'; $help = ''; + $mem_warning = ''; $result = getPhpiniUploadLimits(); + if($result['post_max_size'] < 4194304 || $result['max_upload_filesize'] < 4194304) { + $mem_warning = '<strong>' .t('This is not sufficient to upload larger images or files. You should be able to upload at least 4 MB at once.') . '</strong>'; + } $help = sprintf(t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'), userReadableSize($result['post_max_size']), userReadableSize($result['max_upload_filesize']), $result['max_file_uploads'] ); + $help .= $mem_warning; $help .= '<br><br>' . t('You can adjust these settings in the server php.ini file.'); $this->check_add($checks, t('PHP upload limits'), true, false, $help); |