mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 05:55:15 +02:00
Code Issues Releases Wiki Activity

Hmm, does this thing work?

Browse Source 
Let's get rid of #9680 and #9843 while we are at it.


git-svn-id: file:///svn/phpbb/trunk@7392 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-04-24 11:13:54 +00:00
parent 5ebb018cb8
commit 99b9d56ba8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_convert.php
View File

@ -526,7 +526,8 @@ function _import_check($config_var, $source, $use_target)
'relative_path' => (empty($convert->convertor['source_path_absolute'])) ? true : false,
);
$target = '../' . $config[$config_var] . '/' . basename(($use_target === false) ? $source : $use_target);
// copy file will prepend $phpBB_root_path
$target = $config[$config_var] . '/' . basename(($use_target === false) ? $source : $use_target);
if (!empty($convert->convertor[$config_var]) && strpos($source, $convert->convertor[$config_var]) !== 0)
{
@ -2149,7 +2150,6 @@ function convert_bbcode($message, $convert_size = true, $extended_bbcodes = fals
function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
{
global $convert, $phpbb_root_path, $config, $user, $db;
if (substr($trg, -1) == '/')
{
$trg .= basename($src);
@ -2161,7 +2161,6 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
{
return true;
}
if (!@file_exists($src_path))
{
return;
@ -2188,7 +2187,7 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
if (!@copy($src_path, $phpbb_root_path . $trg_path))
{
$convert->p_master->error(sprintf($user->lang['COULD_NOT_COPY'], $src_path, $phpbb_root_path . $trg), __LINE__, __FILE__, !$die_on_failure);
$convert->p_master->error(sprintf($user->lang['COULD_NOT_COPY'], $src_path, $phpbb_root_path . $trg_path), __LINE__, __FILE__, !$die_on_failure);
return;
}