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

Merge pull request #6551 from marc1706/ticket/17198

Browse source 
[ticket/17198] Use https instead of http as default in remote avatar
This commit is contained in:
Marc Alexander 2023-09-30 13:22:21 +02:00
commit 78aca08d39
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/avatar/driver/remote.php
View file

@ -62,7 +62,7 @@ class remote extends \phpbb\avatar\driver\driver
if (!preg_match('#^(http|https|ftp)://#i', $url))
{
$url = 'http://' . $url;
$url = 'https://' . $url;
}
if (!function_exists('validate_data'))

3
tests/avatar/manager_test.php
View file

@ -27,7 +27,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
protected function setUp(): void
{
global $phpbb_root_path, $phpEx;
global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
// Mock phpbb_container
$phpbb_container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
@ -60,6 +60,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
$imagesize = new \FastImageSize\FastImageSize();
$dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_dispatcher = $dispatcher;
// $this->avatar_foobar will be needed later on
$this->avatar_foobar = $this->getMockBuilder('\phpbb\avatar\driver\foobar')