diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-04 01:07:30 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-04 01:07:30 +0000 |
| commit | 4a17abbcc4950cef434e579c8fa68cc32bf8c284 (patch) | |
| tree | 65747b8e6a64d3b2d9650cc30433a16d6185ac7c /phpBB/includes | |
| parent | dec3e2f728bb5fb344c0098b6a8b909495d2d662 (diff) | |
| download | forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.gz forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.bz2 forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.tar.xz forums-4a17abbcc4950cef434e579c8fa68cc32bf8c284.zip | |
Merge r10473 into the 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_convert.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 82ec114c09..8a1d07c8e5 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1232,6 +1232,11 @@ function get_config() $convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__); } + if (isset($convert->config_schema['array_name'])) + { + unset($convert->config_schema['array_name']); + } + $convert_config = extract_variables_from_file($filename); if (!empty($convert->config_schema['array_name'])) { @@ -1264,6 +1269,7 @@ function restore_config($schema) global $db, $config; $convert_config = get_config(); + foreach ($schema['settings'] as $config_name => $src) { if (preg_match('/(.*)\((.*)\)/', $src, $m)) @@ -1274,8 +1280,16 @@ function restore_config($schema) } else { - $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; - } + if ($schema['table_format'] != 'file' || empty($schema['array_name'])) + { + $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; + } + else if (!empty($schema['array_name'])) + { + $src_ary = $schema['array_name']; + $config_value = (isset($convert_config[$src_ary][$src])) ? $convert_config[$src_ary][$src] : ''; + } + } if ($config_value !== '') { |