mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse Source 
* develop-olympus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
This commit is contained in:
Andreas Fischer
2014-06-24 20:59:11 +02:00
parent 1edcfcb502 2596dbc850
commit b5b0175d59
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/posting.php
View File

@@ -225,6 +225,7 @@ $lang = array_merge($lang, array(
),
'QUOTE_NO_NESTING' => 'You may not embed quotes within each other.',
'REMOTE_UPLOAD_TIMEOUT' => 'The specified file could not be uploaded because the request timed out.',
'SAVE' => 'Save',
'SAVE_DATE' => 'Saved at',
'SAVE_DRAFT' => 'Save draft',