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

fix some general bugs and some convertor related

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6872 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-10 16:47:16 +00:00
parent 31ee257ab8
commit b621bb66c5
13 changed files with 170 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions_convert.php
View File

@@ -985,7 +985,7 @@ function set_user_options()
foreach ($keyoptions as $key => $key_ary)
{
$value = (isset($row[$key])) ? (int) $row[$key] : $key_ary['default'];
$value = (isset($convert_row[$key])) ? (int) $convert_row[$key] : $key_ary['default'];
if ($value && !($option_field & 1 << $key_ary['bit']))
{
@@ -1158,7 +1158,7 @@ function get_config()
}
else if ($convert->config_schema['table_format'] == 'file')
{
$filename = $convert->convertor_status['forum_path'] . '/' . $convert->config_schema['filename'];
$filename = $convert->options['forum_path'] . '/' . $convert->config_schema['filename'];
if (!file_exists($filename))
{
$convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__);
@@ -2278,7 +2278,7 @@ function relative_base($path, $is_relative = true, $line = false, $file = false)
return $path;
}
if (empty($convert->convertor_status['forum_path']) && $is_relative)
if (empty($convert->options['forum_path']) && $is_relative)
{
$line = $line ? $line : __LINE__;
$file = $file ? $file : __FILE__;
@@ -2286,7 +2286,7 @@ function relative_base($path, $is_relative = true, $line = false, $file = false)
$convert->p_master->error($user->lang['CONV_ERROR_NO_FORUM_PATH'], $line, $file);
}
return $convert->convertor_status['forum_path'] . '/' . $path;
return $convert->options['forum_path'] . '/' . $path;
}
?>