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 '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-02-23 20:36:45 +01:00
commit ab9f636ad6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/session.php
View file

@ -1378,12 +1378,12 @@ class session
}
$dnsbl_check = array(
'sbl.spamhaus.org' => ['http://www.spamhaus.org/query/bl?ip=', 'check_dnsbl_spamhaus'],
'sbl.spamhaus.org' => ['https://check.spamhaus.org/listed/?searchterm=', 'check_dnsbl_spamhaus'],
);
if ($mode == 'register')
{
$dnsbl_check['bl.spamcop.net'] = ['http://spamcop.net/bl.shtml?', 'check_dnsbl_ipv4_generic'];
$dnsbl_check['bl.spamcop.net'] = ['https://www.spamcop.net/bl.shtml?', 'check_dnsbl_ipv4_generic'];
}
if ($ip)

1
tests/functional/browse_disabled_test.php
View file

@ -122,7 +122,6 @@ class phpbb_functional_browse_disabled_test extends phpbb_functional_test_case
$this->login();
$this->admin_login();
$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_user_local&user_id[0]=$user_id&forum_id[0]=2&type=m_&sid={$this->sid}");
var_export($crawler->text());
$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form();
$data = array("setting[$user_id][2][m_edit]" => ACL_YES);
$form->setValues($data);