aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/avatar/driver
diff options
context:
space:
mode:
authorJakub Senko <jakubsenko@gmail.com>2016-02-10 11:13:02 +0100
committerJakub Senko <jakubsenko@gmail.com>2016-03-10 13:25:43 +0100
commit795ce6ccf1087c1d7c61c568cd83862302be8fe0 (patch)
tree6f6c6b45ba379f3727a3707e35dc31513f14af5f /phpBB/phpbb/avatar/driver
parentad5d4f6bc3a061452d415ce0ee5929e33566f29b (diff)
downloadforums-795ce6ccf1087c1d7c61c568cd83862302be8fe0.tar
forums-795ce6ccf1087c1d7c61c568cd83862302be8fe0.tar.gz
forums-795ce6ccf1087c1d7c61c568cd83862302be8fe0.tar.bz2
forums-795ce6ccf1087c1d7c61c568cd83862302be8fe0.tar.xz
forums-795ce6ccf1087c1d7c61c568cd83862302be8fe0.zip
[ticket/14471] Add $filedata to core.avatar_driver_upload_move_file_before event
PHPBB3-14471
Diffstat (limited to 'phpBB/phpbb/avatar/driver')
-rw-r--r--phpBB/phpbb/avatar/driver/upload.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index e44157294c..cb8dfcad4f 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -167,17 +167,29 @@ class upload extends \phpbb\avatar\driver\driver
$destination = '';
}
+ $filedata = array(
+ 'filename' => $file->get('filename'),
+ 'filesize' => $file->get('filesize'),
+ 'mimetype' => $file->get('mimetype'),
+ 'extension' => $file->get('extension'),
+ 'physical_filename' => $file->get('realname'),
+ 'real_filename' => $file->get('uploadname'),
+ );
+
/**
* Before moving new file in place (and eventually overwriting the existing avatar with the newly uploaded avatar)
*
* @event core.avatar_driver_upload_move_file_before
+ * @var array filedata Array containing uploaded file data
* @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
*/
$vars = array(
+ 'filedata',
'destination',
'prefix',
'row',
@@ -185,6 +197,8 @@ class upload extends \phpbb\avatar\driver\driver
);
extract($this->dispatcher->trigger_event('core.avatar_driver_upload_move_file_before', compact($vars)));
+ unset($filedata);
+
if (!sizeof($error))
{
// Move file and overwrite any existing image