1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

6 Commits

Author SHA1 Message Date
Marc Alexander
943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
	phpBB/config/services.yml
2013-11-23 00:54:56 +01:00
Marc Alexander
81caa35955 [ticket/11912] Remove obsolete $file_info from plupload
PHPBB3-11912
2013-11-11 21:24:44 +01:00
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
Marc Alexander
bc7ff47537 [ticket/11912] Supply filename to content_guesser for guessing on windows
The filename of the files sent to the guesser by plupload do not contain
the file extension. Therefore, it's impossible to guess the mimetype if
only the content_guesser is available and the function mime_content_type()
doesn't exist. By supplying the filename we can circumvent this issue.

PHPBB3-11912
2013-10-24 12:05:00 +02:00
Marc Alexander
789d493595 [ticket/11912] Integrate mimetype guesser with plupload
PHPBB3-11912
2013-10-23 18:34:06 +02:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00