mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

[ticket/15276] Remove avatar_path

Browse Source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo
2017-08-09 13:43:22 +02:00
parent 0ff80fead8
commit 2afada5a5a
9 changed files with 39 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions_download.php
View File

@@ -30,20 +30,7 @@ function send_avatar_to_browser($file, $browser)
$storage = $phpbb_container->get('storage.avatar');
$prefix = $config['avatar_salt'] . '_';
$image_dir = $config['avatar_path'];
// Adjust image_dir path (no trailing slash)
if (substr($image_dir, -1, 1) == '/' || substr($image_dir, -1, 1) == '\\')
{
$image_dir = substr($image_dir, 0, -1) . '/';
}
$image_dir = str_replace(array('../', '..\\', './', '.\\'), '', $image_dir);
if ($image_dir && ($image_dir[0] == '/' || $image_dir[0] == '\\'))
{
$image_dir = '';
}
$file_path = $image_dir . '/' . $prefix . $file;
$file_path = $prefix . $file;
if ($storage->exists($file_path) && !headers_sent())
{