diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-01 23:20:47 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:20:47 +0200 |
| commit | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (patch) | |
| tree | 436b0de846650bce13436b51a2d5214224f8898c /engine/lib/actions.php | |
| parent | 3da3f2aa28a42c23bdc9d661e7e13fd6f2bd2b10 (diff) | |
| parent | b91d8bb0fea5cef9fafea72181a0007cfaa54725 (diff) | |
| download | elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.gz elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.bz2 | |
Upgraded to Elgg 1.8.6.
Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.6 release
Diffstat (limited to 'engine/lib/actions.php')
| -rw-r--r-- | engine/lib/actions.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php index c6613e6d6..3a7c02488 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -273,8 +273,19 @@ function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL) } else if ($visibleerrors) { register_error(elgg_echo('actiongatekeeper:tokeninvalid')); } - } else if ($visibleerrors) { - register_error(elgg_echo('actiongatekeeper:missingfields')); + } else { + if (! empty($_SERVER['CONTENT_LENGTH']) && empty($_POST)) { + // The size of $_POST or uploaded file has exceed the size limit + $error_msg = elgg_trigger_plugin_hook('action_gatekeeper:upload_exceeded_msg', 'all', array( + 'post_size' => $_SERVER['CONTENT_LENGTH'], + 'visible_errors' => $visibleerrors, + ), elgg_echo('actiongatekeeper:uploadexceeded')); + } else { + $error_msg = elgg_echo('actiongatekeeper:missingfields'); + } + if ($visibleerrors) { + register_error($error_msg); + } } return FALSE; |