makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15276] Update

Browse source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo 2017-08-09 16:07:28 +02:00
parent 2afada5a5a
commit 3c60333725
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_user.php
View file

@ -2191,8 +2191,10 @@ function avatar_delete($mode, $row, $clean_db = false)
} }
catch (\phpbb\storage\exception\exception $e) catch (\phpbb\storage\exception\exception $e)
{ {
return false; // Fail is covered by return statement below
} }
return false;
} }
/** /**

2
phpBB/install/convertors/convert_phpbb20.php
View file

@ -311,7 +311,7 @@ if (!$get_info)
$convertor = array( $convertor = array(
'test_file' => 'viewtopic.php', 'test_file' => 'viewtopic.php',
'avatar_path' => get_config_value('storage\\avatar\\config\\path') . '/', 'avatar_path' => get_config_value('avatar_path') . '/',
'avatar_gallery_path' => get_config_value('avatar_gallery_path') . '/', 'avatar_gallery_path' => get_config_value('avatar_gallery_path') . '/',
'smilies_path' => get_config_value('smilies_path') . '/', 'smilies_path' => get_config_value('smilies_path') . '/',
'upload_path' => (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '', 'upload_path' => (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '',