From 8718c5ef31fd6acd7023aef378b02e19246642d4 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 12 Mar 2019 06:25:56 -0600 Subject: [PATCH] Remove legacy media.upload_limit references --- system/src/Grav/Common/Config/Config.php | 5 ++--- system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php index 9eaf57abd..7b808463b 100644 --- a/system/src/Grav/Common/Config/Config.php +++ b/system/src/Grav/Common/Config/Config.php @@ -109,9 +109,8 @@ class Config extends Data } } - // Override the media.upload_limit based on PHP values - $upload_limit = Utils::getUploadLimit(); - $this->items['system']['media']['upload_limit'] = $upload_limit > 0 ? $upload_limit : 1024*1024*1024; + // Legacy value - Override the media.upload_limit based on PHP values + $this->items['system']['media']['upload_limit'] = Utils::getUploadLimit(); } /** diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php index ef46e0c9a..8ca7e258a 100644 --- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php +++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php @@ -107,10 +107,7 @@ trait FlexMediaTrait throw new RuntimeException(sprintf($language->translate('PLUGIN_ADMIN.FILEUPLOAD_UNABLE_TO_UPLOAD'), $filename, 'Bad filename'), 400); } - /** @var Config $config */ - $config = $grav['config']; - $grav_limit = (int) $config->get('system.media.upload_limit', 0); - + $grav_limit = Utils::getUploadLimit(); if ($grav_limit > 0 && $uploadedFile->getSize() > $grav_limit) { throw new RuntimeException($language->translate('PLUGIN_ADMIN.EXCEEDED_GRAV_FILESIZE_LIMIT'), 400); }