D11031.id26483.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11031.id26483.diff
View Options

	diff --git a/src/applications/files/exception/PhabricatorFileUploadException.php b/src/applications/files/exception/PhabricatorFileUploadException.php
	--- a/src/applications/files/exception/PhabricatorFileUploadException.php
	+++ b/src/applications/files/exception/PhabricatorFileUploadException.php
	@@ -3,10 +3,23 @@
	final class PhabricatorFileUploadException extends Exception {

	public function __construct($code) {
	+ $limit = PhabricatorEnv::getEnvConfig('storage.upload-size-limit');
	+ if (!$limit) {
	+ $limit = ini_get('upload_max_filesize');
	+
	+ $file_too_large_msg =
	+ pht("Uploaded file is too large: current limit is %s. Consider ".
	+ "changing 'upload_max_filesize' in php.ini.", $limit);
	+ } else {
	+ $file_too_large_msg =
	+ pht("Uploaded file is too large: current limit is %s. Consider ".
	+ "changing 'storage.upload-size-limit' in the phabricator config.",
	+ $limit);
	+ }
	+
	$map = array(
	UPLOAD_ERR_INI_SIZE =>
	- "Uploaded file is too large: file is larger than the ".
	- "'upload_max_filesize' setting in php.ini.",
	+ $file_too_large_msg,
	UPLOAD_ERR_FORM_SIZE =>
	'File is too large.',
	UPLOAD_ERR_PARTIAL =>
	@@ -21,8 +34,7 @@
	'Unable to upload: a PHP extension stopped the upload.',

	-1000 =>
	- "Uploaded file exceeds limit in Phabricator ".
	- "'storage.upload-size-limit' configuration.",
	+ $file_too_large_msg,
	);

	$message = idx($map, $code, 'Upload failed: unknown error.');