diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:46:40 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:46:40 +0100 |
| commit | 9671ace32e57ce6b176a50dc346baf3b3b7eb14e (patch) | |
| tree | bf3b4afd8de851d108909fc5a9ad198c13d93c8a /apps/files/templates | |
| parent | 9cd7bb2c8d7b7207a3c67e09158641b0c33e631d (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-9671ace32e57ce6b176a50dc346baf3b3b7eb14e.tar.gz nextcloud-server-9671ace32e57ce6b176a50dc346baf3b3b7eb14e.zip | |
Merge branch 'master' into fix_minor_files_annoyances
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/admin.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 0de12edcba5..ad69b5519d9 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -6,7 +6,10 @@ <?php if($_['uploadChangable']):?> <label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label> <input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/> - (<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/> + <?php if($_['displayMaxPossibleUploadSize']):?> + (<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>) + <?php endif;?> + <br/> <?php endif;?> <input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>" |