summaryrefslogtreecommitdiffstats
path: root/apps/files/admin.php
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@karoshi.org.uk>2015-06-25 16:45:17 +0100
committerRobin McCorkell <rmccorkell@karoshi.org.uk>2015-07-20 12:52:43 +0100
commitd3bcafe6185c30d2e2bfecbd919568a8197818bc (patch)
treeaf817c020a2087a8474aadf68dd3ef40f4cefd22 /apps/files/admin.php
parentf573659b3aba706e55e312093954cffbc5373a8b (diff)
downloadnextcloud-server-d3bcafe6185c30d2e2bfecbd919568a8197818bc.tar.gz
nextcloud-server-d3bcafe6185c30d2e2bfecbd919568a8197818bc.zip
Update .user.ini when setting upload size limit
Diffstat (limited to 'apps/files/admin.php')
-rw-r--r--apps/files/admin.php3
1 files changed, 2 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);