mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 03:04:09 +02:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
This commit is contained in:
@@ -107,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
|
||||
|
||||
$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
|
||||
|
||||
// Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the
|
||||
// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
|
||||
// DISALLOWED_CONTENT check
|
||||
$this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text());
|
||||
$this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text());
|
||||
}
|
||||
|
||||
public function test_too_large()
|
||||
|
Reference in New Issue
Block a user