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

another Oracle fix

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7733 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2007-06-08 16:00:30 +00:00
parent d79b43b4aa
commit 472d64663d
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/install/install_install.php
View File

@@ -738,7 +738,7 @@ class install_install extends module
if ($board_email1 != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $board_email1)) if ($board_email1 != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $board_email1))
{ {
$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,
@@ -1645,14 +1645,19 @@ class install_install extends module
AND module_class = '" . $db->sql_escape($module_class) . "' AND module_class = '" . $db->sql_escape($module_class) . "'
AND module_basename <> ''"; AND module_basename <> ''";
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
$module_data = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
unset($module_data['module_id']); $module_data = array(
unset($module_data['left_id']); 'module_basename' => $row['module_basename'],
unset($module_data['right_id']); 'module_enabled' => $row['module_enabled'],
'module_display' => $row['module_display'],
$module_data['parent_id'] = (int) $row2['module_id']; 'parent_id' => (int) $row2['module_id'],
'module_class' => $row['module_class'],
'module_langname' => $row['module_langname'],
'module_mode' => $row['module_mode'],
'module_auth' => $row['module_auth'],
);
$_module->update_module_data($module_data, true); $_module->update_module_data($module_data, true);