diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:10:37 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:10:37 +0200 |
| commit | a54fc186204a2f45646b450ccfebeac16cd75b08 (patch) | |
| tree | f62c394659c14b0d9ccea2a4fc135412d307cd97 | |
| parent | ce73ffae165c8b3981b705e2760f327a489ddba1 (diff) | |
| parent | 41476816403be3bd73dd19511f491ea955a1fa62 (diff) | |
| download | forums-a54fc186204a2f45646b450ccfebeac16cd75b08.tar forums-a54fc186204a2f45646b450ccfebeac16cd75b08.tar.gz forums-a54fc186204a2f45646b450ccfebeac16cd75b08.tar.bz2 forums-a54fc186204a2f45646b450ccfebeac16cd75b08.tar.xz forums-a54fc186204a2f45646b450ccfebeac16cd75b08.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12522] Add function parameter description in guesser interface
| -rw-r--r-- | phpBB/phpbb/mimetype/guesser_interface.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/mimetype/guesser_interface.php b/phpBB/phpbb/mimetype/guesser_interface.php index 103689765e..3cbcfeabe3 100644 --- a/phpBB/phpbb/mimetype/guesser_interface.php +++ b/phpBB/phpbb/mimetype/guesser_interface.php @@ -26,6 +26,7 @@ interface guesser_interface * Guess mimetype of supplied file * * @param string $file Path to file + * @param string $file_name The real file name * * @return string Guess for mimetype of file */ |