diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:27:19 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:27:19 +0200 |
| commit | 3477b5e5a8c419f28d477a4764f5d29f3b04dc79 (patch) | |
| tree | ad0fa7d37478315948833828da99e71d84c90403 /phpBB/includes/functions_posting.php | |
| parent | 313cf7297cb8d7b766d34ab1e2c65445d0c6379d (diff) | |
| parent | b8b342be2d238616b96ace9acbe8af2e18ba1e7a (diff) | |
| download | forums-3477b5e5a8c419f28d477a4764f5d29f3b04dc79.tar forums-3477b5e5a8c419f28d477a4764f5d29f3b04dc79.tar.gz forums-3477b5e5a8c419f28d477a4764f5d29f3b04dc79.tar.bz2 forums-3477b5e5a8c419f28d477a4764f5d29f3b04dc79.tar.xz forums-3477b5e5a8c419f28d477a4764f5d29f3b04dc79.zip | |
Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus
* Dickyf/ticket/10675:
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[ticket/10675] Add disk full language string when posting attachments
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 7f45b2da8c..68b6199cf5 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -497,7 +497,14 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage { if ($free_space <= $file->get('filesize')) { - $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; + if ($auth->acl_get('a_')) + { + $filedata['error'][] = $user->lang['ATTACH_DISK_FULL']; + } + else + { + $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; + } $filedata['post_attach'] = false; $file->remove(); |