diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-17 13:27:47 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-17 13:27:47 +0100 |
| commit | 675d852c7d141f2dd83c32bb82a8c894838d6907 (patch) | |
| tree | 9bc33fcbdf82dd2cb7df3f89c6f9fc9dc5f53870 /apps | |
| parent | 47e05c97a2302804fa8f0a28d3198ba686c2e656 (diff) | |
| parent | aac84f732dd192a5f13fe4b31ad0a384d6aa890b (diff) | |
| download | nextcloud-server-675d852c7d141f2dd83c32bb82a8c894838d6907.tar.gz nextcloud-server-675d852c7d141f2dd83c32bb82a8c894838d6907.zip | |
Merge pull request #17182 from owncloud/user_ini_upload_size
Update .user.ini when setting upload size limit
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/admin.php | 3 | ||||
| -rw-r--r-- | apps/files/templates/admin.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php index 70f537d0db9..349c27ff742 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -42,9 +42,10 @@ if($_POST && OC_Util::isCallRegistered()) { } $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess'); +$userIniWritable=is_writable(OC::$SERVERROOT.'/.user.ini'); $tmpl = new OCP\Template( 'files', 'admin' ); -$tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable ); +$tmpl->assign( 'uploadChangable', ($htaccessWorking and $htaccessWritable) or $userIniWritable ); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); // max possible makes only sense on a 32 bit system $tmpl->assign( 'displayMaxPossibleUploadSize', PHP_INT_SIZE===4); diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index adf756a12be..822fc779bd3 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -10,6 +10,8 @@ <br/> <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" /> <?php if($_['uploadChangable']): ?> + <?php p($l->t('With PHP-FPM this value may take up to 5 minutes to take effect after saving.')); ?> + <br/> <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php p($l->t( 'Save' )); ?>"/> <?php else: ?> |