aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-06-08 16:00:30 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-06-08 16:00:30 +0000
commit472d64663d998167a7deafb4134b540d5dcca38d (patch)
treeb21aa2c92bffa02e0d91e2f44212f5d337c1bffd /phpBB/install
parentd79b43b4aa2f42068259f186eb098c461e8f2c09 (diff)
downloadforums-472d64663d998167a7deafb4134b540d5dcca38d.tar
forums-472d64663d998167a7deafb4134b540d5dcca38d.tar.gz
forums-472d64663d998167a7deafb4134b540d5dcca38d.tar.bz2
forums-472d64663d998167a7deafb4134b540d5dcca38d.tar.xz
forums-472d64663d998167a7deafb4134b540d5dcca38d.zip
another Oracle fix
git-svn-id: file:///svn/phpbb/trunk@7733 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rwxr-xr-xphpBB/install/install_install.php19
1 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1bf86318c8..65229618dd 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -738,7 +738,7 @@ class install_install extends module
if ($board_email1 != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $board_email1))
{
$error[] = $lang['INST_ERR_EMAIL_INVALID'];
- }
+ }$error = array();
$template->assign_block_vars('checks', array(
'S_LEGEND' => true,
@@ -1645,14 +1645,19 @@ class install_install extends module
AND module_class = '" . $db->sql_escape($module_class) . "'
AND module_basename <> ''";
$result = $db->sql_query_limit($sql, 1);
- $module_data = $db->sql_fetchrow($result);
+ $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
- unset($module_data['module_id']);
- unset($module_data['left_id']);
- unset($module_data['right_id']);
-
- $module_data['parent_id'] = (int) $row2['module_id'];
+ $module_data = array(
+ 'module_basename' => $row['module_basename'],
+ 'module_enabled' => $row['module_enabled'],
+ 'module_display' => $row['module_display'],
+ '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);