diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:29:56 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 19:29:56 +0200 |
| commit | 1d4253319cf2a48fee43e892b3ca815b276d8f6a (patch) | |
| tree | 1f261b3f235f32e271291fc27d7a6be5acc39783 | |
| parent | 7e2f16aafa47f8db51a12a293b0616cb75b4d12f (diff) | |
| parent | 3477b5e5a8c419f28d477a4764f5d29f3b04dc79 (diff) | |
| download | forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.gz forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.bz2 forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.tar.xz forums-1d4253319cf2a48fee43e892b3ca815b276d8f6a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10675] Add disk full language string when posting attachments
| -rw-r--r-- | phpBB/includes/functions_posting.php | 9 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b3816baedd..f77f54679f 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -496,7 +496,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(); diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 933287dde3..086bd6ffb0 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -41,6 +41,7 @@ $lang = array_merge($lang, array( 'ADD_POLL' => 'Poll creation', 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.', 'ALREADY_DELETED' => 'Sorry but this message is already deleted.', + 'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.', 'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.', 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)', |