aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_upload.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-04-30 10:46:17 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-04-30 10:46:17 +0000
commit42251d008c06ad0f475f116643c6583fc9a4eda7 (patch)
tree0380ef1d4f7224c96612a8951988a59f33c6074e /phpBB/includes/functions_upload.php
parentdc747b8d994b6f5d07182196ed9deed7959a7317 (diff)
downloadforums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.gz
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.bz2
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.xz
forums-42251d008c06ad0f475f116643c6583fc9a4eda7.zip
Prepare to be yelled at and brace for the tide of bug reports: I had hoped we would not have to do this, but it seems that we have to.
-Route all avatar downloads through download.php - adrien -Change the way inline attachments are delivered -Fixes a few (unreported) bugs, notably avatar upload during group generation -#10079 git-svn-id: file:///svn/phpbb/trunk@7429 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_upload.php')
-rw-r--r--phpBB/includes/functions_upload.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index cd14b26169..92c6b1a938 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -81,7 +81,7 @@ class filespec
* @param string $prefix Prefix applied to filename
* @access public
*/
- function clean_filename($mode = 'unique', $prefix = '')
+ function clean_filename($mode = 'unique', $prefix = '', $user_id = '')
{
if ($this->init_error)
{
@@ -110,6 +110,10 @@ class filespec
$this->realname = $prefix . md5(unique_id());
break;
+ case 'avatar':
+ $this->realname = $prefix . $user_id . '.' . $this->extension;
+ break;
+
case 'unique_ext':
default:
$this->realname = $prefix . md5(unique_id()) . '.' . $this->extension;