|
nicofuma
|
1a484f08bbacf2d2f97f94a0583095ae83a92bec
1a484f08bbacf2d2f97f94a0583095ae83a92bec |
Merge branch '3.0.x' into 3.1.x |
|
|
nicofuma
|
d9f4964d914d5079025a2d86ae0a6d64df10cdaa
d9f4964d914d5079025a2d86ae0a6d64df10cdaa |
Merge pull request #3376 from marc1706/ticket/13568-asc
[ticket/13568] Validate imagick path as readable absolute path
closes #3376 |
|
|
nicofuma
|
b9db47e3f52a8723b06e01f15c6e44052c014c42
b9db47e3f52a8723b06e01f15c6e44052c014c42 |
Merge pull request #3359 from marc1706/ticket/13568
[ticket/13568] Validate imagick path as readable absolute path
closes #3359 |
|
|
Marc
|
1da6b30cf04ff8fb06f38dd1ff8ab211af0a763f
1da6b30cf04ff8fb06f38dd1ff8ab211af0a763f |
[ticket/13568] Add unit tests for validating absolute path
PHPBB3-13568 |
|
|
Marc
|
cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e
cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e |
Merge branch 'ticket/13568' into ticket/13568-asc
Conflicts:
phpBB/adm/index.php
phpBB/includes/acp/acp_attachments.php |
|