summaryrefslogtreecommitdiffstats
path: root/system/application
diff options
context:
space:
mode:
Diffstat (limited to 'system/application')
-rw-r--r--system/application/controllers/file.php1
-rw-r--r--system/application/views/file/upload_form.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/system/application/controllers/file.php b/system/application/controllers/file.php
index 601cf80e1..e2d30c069 100644
--- a/system/application/controllers/file.php
+++ b/system/application/controllers/file.php
@@ -50,6 +50,7 @@ class File extends Controller {
$data = array();
$data['title'] = 'Upload';
$data['small_upload_size'] = $this->config->item('small_upload_size');
+ $data['max_upload_size'] = $this->config->item('upload_max_size');
$this->load->view('file/header', $data);
$this->load->view('file/upload_form', $data);
diff --git a/system/application/views/file/upload_form.php b/system/application/views/file/upload_form.php
index 300fa7558..b906dcd0f 100644
--- a/system/application/views/file/upload_form.php
+++ b/system/application/views/file/upload_form.php
@@ -14,7 +14,7 @@
<br /><br />
<p>Uploads/pastes are deleted after 5 days<?php if($small_upload_size > 0): ?>
unless they are smaller than <?php echo format_bytes($small_upload_size); ?>
-<?php endif; ?>.</p>
+ <?php endif; ?>. Maximum upload size is <?php echo format_bytes($max_upload_size); ?></p>
<br />
<p>For shell uploading/pasting use:</p>
<pre>