makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16764] Remove more remnants of remote uploading

Browse source 
PHPBB3-16764
This commit is contained in:
Marc Alexander 2021-04-26 20:44:15 +02:00
parent 0ccce7c4f8
commit c45c7f4622
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/install/convertors/functions_phpbb20.php
View file

@ -1542,11 +1542,6 @@ function phpbb_import_avatar($user_avatar)
// Uploaded avatar // Uploaded avatar
return import_avatar($user_avatar, false, $convert_row['user_id']); return import_avatar($user_avatar, false, $convert_row['user_id']);
} }
else if ($convert_row['user_avatar_type'] == 2)
{
// Remote avatar
return $user_avatar;
}
else if ($convert_row['user_avatar_type'] == 3) else if ($convert_row['user_avatar_type'] == 3)
{ {
// Gallery avatar // Gallery avatar

2
phpBB/language/en/posting.php
View file

@ -121,7 +121,6 @@ $lang = array_merge($lang, array(
'EDIT_REASON' => 'Reason for editing this post', 'EDIT_REASON' => 'Reason for editing this post',
'EMPTY_FILEUPLOAD' => 'The uploaded file is empty.', 'EMPTY_FILEUPLOAD' => 'The uploaded file is empty.',
'EMPTY_MESSAGE' => 'You must enter a message when posting.', 'EMPTY_MESSAGE' => 'You must enter a message when posting.',
'EMPTY_REMOTE_DATA' => 'File could not be uploaded, please try uploading the file manually.',
'FLASH_IS_OFF' => '[flash] is <em>OFF</em>', 'FLASH_IS_OFF' => '[flash] is <em>OFF</em>',
'FLASH_IS_ON' => '[flash] is <em>ON</em>', 'FLASH_IS_ON' => '[flash] is <em>ON</em>',
@ -236,7 +235,6 @@ $lang = array_merge($lang, array(
), ),
'QUOTE_NO_NESTING' => 'You may not embed quotes within each other.', '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' => 'Save',
'SAVE_DATE' => 'Saved at', 'SAVE_DATE' => 'Saved at',
'SAVE_DRAFT' => 'Save draft', 'SAVE_DRAFT' => 'Save draft',

3
phpBB/phpbb/files/upload.php
View file

@ -46,9 +46,6 @@ class upload
/** @var string Prefix for language variables of errors */ /** @var string Prefix for language variables of errors */
public $error_prefix = ''; public $error_prefix = '';
/** @var int Timeout for remote upload */
public $upload_timeout = 6;
/** @var \phpbb\files\factory Files factory */ /** @var \phpbb\files\factory Files factory */
protected $factory; protected $factory;

2
tests/files/type_foo.php
View file

@ -13,7 +13,7 @@
namespace phpbb\files\types; namespace phpbb\files\types;
class foo extends \phpbb\files\types\remote class foo extends \phpbb\files\types\upload
{ {
static public $tempnam_path; static public $tempnam_path;
} }