git-svn-id: file:///svn/phpbb/trunk@7420 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-04-28 14:18:00 +00:00
parent 2c7ef5f5c0
commit 946b87233b

View file

@ -697,6 +697,7 @@ class install_install extends module
{ {
$error[] = $lang['INST_ERR_EMAIL_INVALID']; $error[] = $lang['INST_ERR_EMAIL_INVALID'];
} }
$error = array();
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(
'S_LEGEND' => true, 'S_LEGEND' => true,
@ -1637,9 +1638,9 @@ class install_install extends module
while ($imageset_row = $db->sql_fetchrow($result)) while ($imageset_row = $db->sql_fetchrow($result))
{ {
if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg")) if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg"))
{ {
$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg"); $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg");
foreach ($cfg_data_imageset_data as $image_name => $value) foreach ($cfg_data_imageset_data as $image_name => $value)
{ {
if (strpos($value, '*') !== false) if (strpos($value, '*') !== false)
@ -1671,7 +1672,7 @@ class install_install extends module
'image_height' => $image_height, 'image_height' => $image_height,
'image_width' => $image_width, 'image_width' => $image_width,
'imageset_id' => $imageset_row['imageset_id'], 'imageset_id' => $imageset_row['imageset_id'],
'image_lang' => $lang_pack['iso'], 'image_lang' => $lang_pack['lang_iso'],
); );
} }
} }