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 branch 'phpbb:master' into patch-4

Browse source
This commit is contained in:
phpBB TR 2024-12-11 20:55:34 +03:00 • committed by GitHub
commit bccc0fc6a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/acp/acp_board.php
View file

@ -938,7 +938,7 @@ class acp_board
*/
function select_acc_activation($selected_value, $value)
{
global $user, $config;
global $user, $config, $phpbb_dispatcher;
$act_ary = [
'ACC_DISABLE' => [true, USER_ACTIVATION_DISABLE],
@ -948,6 +948,18 @@ class acp_board
];
$act_options = [];
/**
* Event to add and/or modify account activation configurations
*
* @event core.acp_account_activation_edit_add
* @var array act_ary Array of account activation methods
* @var array act_options Options available in the activation method
* @since 3.3.15-RC1
*/
$vars = ['act_ary', 'act_options'];
extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars)));
foreach ($act_ary as $key => $data)
{
list($available, $value) = $data;

4
phpBB/phpbb/file_downloader.php
View file

@ -51,6 +51,10 @@ class file_downloader
return new Client([
'base_uri' => $host,
'timeout' => $timeout,
'headers' => [
'user-agent' => 'phpBB/' . PHPBB_VERSION,
'accept' => '*/*',
],
]);
}

2
phpBB/phpbb/version_helper.php
View file

@ -382,7 +382,7 @@ class version_helper
}
else if ($info === false || $force_update)
{
$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80);
$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80, 30);
$error_string = $this->file_downloader->get_error_string();
if (!empty($error_string))