aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-02-19 08:01:54 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-02-19 08:01:54 +0100
commit961e241b2605800329b030faaf9609e80f22411e (patch)
tree0143ba88223625b5734e1dc4640aa6622af80c92 /phpBB/phpbb
parent8ac4f529245c9183fceb586bc58310229d706324 (diff)
parent3244cab37094e51a7a78055b05c0a7f980060865 (diff)
downloadforums-961e241b2605800329b030faaf9609e80f22411e.tar
forums-961e241b2605800329b030faaf9609e80f22411e.tar.gz
forums-961e241b2605800329b030faaf9609e80f22411e.tar.bz2
forums-961e241b2605800329b030faaf9609e80f22411e.tar.xz
forums-961e241b2605800329b030faaf9609e80f22411e.zip
Merge remote-tracking branch 'GerB/patch-4' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index d765a27871..77b44754ac 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -203,15 +203,18 @@ class upload extends \phpbb\avatar\driver\driver
*
* @event core.avatar_driver_upload_move_file_before
* @var array filedata Array containing uploaded file data
+ * @var \phpbb\files\filespec file Instance of filespec class
* @var string destination Destination directory where the file is going to be moved
* @var string prefix Prefix for the avatar filename
* @var array row Array with avatar row data
* @var array error Array of errors, if filled in by this event file will not be moved
* @since 3.1.6-RC1
* @changed 3.1.9-RC1 Added filedata
+ * @changed 3.2.3-RC1 Added file
*/
$vars = array(
'filedata',
+ 'file',
'destination',
'prefix',
'row',