aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-08-10 01:02:27 +0200
committerTristan Darricau <github@nicofuma.fr>2014-08-10 01:02:27 +0200
commitb000d10ef8000bba3a029872a47318a2177e9ab2 (patch)
treee13a2781137b2b6578c6d94c60a73e32e7498e06 /phpBB/phpbb
parent6a8413f064a0a8ade332634c2a891e8ca9038a8b (diff)
parent076d4ddd7f146092ce79b4ea1d11b5731ed2e695 (diff)
downloadforums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar
forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.gz
forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.bz2
forums-b000d10ef8000bba3a029872a47318a2177e9ab2.tar.xz
forums-b000d10ef8000bba3a029872a47318a2177e9ab2.zip
Merge pull request #2849 from bantu/ticket/12941
[ticket/12941] Check for Sami parse errors on Travis CI. * bantu/ticket/12941: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index edc5941602..f5ba50451a 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -27,7 +27,6 @@ class upload extends \phpbb\avatar\driver\driver
* Construct a driver object
*
* @param \phpbb\config\config $config phpBB configuration
- * @param \phpbb\request\request $request Request object
* @param string $phpbb_root_path Path to the phpBB root
* @param string $php_ext PHP file extension
* @param \phpbb_path_helper $path_helper phpBB path helper