Fix handling of upload_max_age = 0

cron code already handled this correctly, valid() didn't.

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 4 insertions, 0 deletions

diff --git a/application/controllers/file.php b/application/controllers/file.php
index 438a47590..f2797e7e7 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -703,6 +703,7 @@ class File extends CI_Controller {
 	{
 		if (!$this->input->is_cli_request()) return;
 
+		// 0 age disables age checks
 		if ($this->config->item('upload_max_age') == 0) return;
 
 		$oldest_time = (time() - $this->config->item('upload_max_age'));
diff --git a/application/models/mfile.php b/application/models/mfile.php
index c56692c93..7d6056a9c 100644
--- a/application/models/mfile.php
+++ b/application/models/mfile.php
@@ -142,6 +142,9 @@ class Mfile extends CI_Model {
 			return false;
 		}
 
+		// 0 age disables age checks
+		if ($this->config->item('upload_max_age') == 0) return true;
+
 		// small files don't expire
 		if (filesize($file) <= $this->config->item("small_upload_size")) {
 			return true;