diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-10 16:47:16 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-10 16:47:16 +0000 |
| commit | b621bb66c50e534086226df89e5c0764535f5832 (patch) | |
| tree | c180852586715d81d37537de19f4eada8be1fa9b /phpBB/includes/functions_convert.php | |
| parent | 31ee257ab8232072676df0d4d354ff7a5a0b1416 (diff) | |
| download | forums-b621bb66c50e534086226df89e5c0764535f5832.tar forums-b621bb66c50e534086226df89e5c0764535f5832.tar.gz forums-b621bb66c50e534086226df89e5c0764535f5832.tar.bz2 forums-b621bb66c50e534086226df89e5c0764535f5832.tar.xz forums-b621bb66c50e534086226df89e5c0764535f5832.zip | |
fix some general bugs and some convertor related
git-svn-id: file:///svn/phpbb/trunk@6872 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_convert.php')
| -rw-r--r-- | phpBB/includes/functions_convert.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 1d78b29968..499d62de3d 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -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; } ?>
\ No newline at end of file |