diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-08 15:14:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-08 15:14:50 +0000 |
| commit | 281c8763bd2f3d7e9dd83e7e7772009f18a69b86 (patch) | |
| tree | 2e2f45e29fb06a44870e953b001307b4d7ee2cba | |
| parent | 539ac00f02f24266f598fb746b2e145e1ec46182 (diff) | |
| download | forums-281c8763bd2f3d7e9dd83e7e7772009f18a69b86.tar forums-281c8763bd2f3d7e9dd83e7e7772009f18a69b86.tar.gz forums-281c8763bd2f3d7e9dd83e7e7772009f18a69b86.tar.bz2 forums-281c8763bd2f3d7e9dd83e7e7772009f18a69b86.tar.xz forums-281c8763bd2f3d7e9dd83e7e7772009f18a69b86.zip | |
#9659
#9569
git-svn-id: file:///svn/phpbb/trunk@7302 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/functions_convert.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 12 |
3 files changed, 11 insertions, 12 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index e82365d0a5..585549fb99 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -721,7 +721,6 @@ class acp_modules if (!isset($module_data['module_id'])) { // no module_id means we're creating a new category/module - if ($module_data['parent_id']) { $sql = 'SELECT left_id, right_id @@ -754,8 +753,8 @@ class acp_modules AND {$row['left_id']} BETWEEN left_id AND right_id"; $db->sql_query($sql); - $module_data['left_id'] = $row['right_id']; - $module_data['right_id'] = $row['right_id'] + 1; + $module_data['left_id'] = (int) $row['right_id']; + $module_data['right_id'] = (int) $row['right_id'] + 1; } else { @@ -766,8 +765,8 @@ class acp_modules $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $module_data['left_id'] = $row['right_id'] + 1; - $module_data['right_id'] = $row['right_id'] + 2; + $module_data['left_id'] = (int) $row['right_id'] + 1; + $module_data['right_id'] = (int) $row['right_id'] + 2; } $sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data); diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index f2988792a6..8aa8f597e8 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1194,7 +1194,7 @@ function restore_config($schema) { if (preg_match('/(.*)\((.*)\)/', $src, $m)) { - $var = (empty($m[2])) ? '' : "'" . addslashes($convert_config[$m[2]]) . "'"; + $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? '' : "'" . addslashes($convert_config[$m[2]]) . "'"; $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; eval($exec); } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 06c360d20c..5808b10557 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1415,7 +1415,7 @@ class install_install extends module $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); } - $categories[$cat_name]['id'] = $module_data['module_id']; + $categories[$cat_name]['id'] = (int) $module_data['module_id']; $categories[$cat_name]['parent_id'] = 0; // Create sub-categories... @@ -1427,7 +1427,7 @@ class install_install extends module 'module_basename' => '', 'module_enabled' => 1, 'module_display' => 1, - 'parent_id' => $categories[$cat_name]['id'], + 'parent_id' => (int) $categories[$cat_name]['id'], 'module_class' => $module_class, 'module_langname' => $level2_name, 'module_mode' => '', @@ -1443,8 +1443,8 @@ class install_install extends module $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); } - $categories[$level2_name]['id'] = $module_data['module_id']; - $categories[$level2_name]['parent_id'] = $categories[$cat_name]['id']; + $categories[$level2_name]['id'] = (int) $module_data['module_id']; + $categories[$level2_name]['parent_id'] = (int) $categories[$cat_name]['id']; } } } @@ -1466,7 +1466,7 @@ class install_install extends module 'module_basename' => $module_basename, 'module_enabled' => 1, 'module_display' => (isset($row['display'])) ? $row['display'] : 1, - 'parent_id' => $categories[$cat_name]['id'], + 'parent_id' => (int) $categories[$cat_name]['id'], 'module_class' => $module_class, 'module_langname' => $row['title'], 'module_mode' => $module_mode, @@ -1569,7 +1569,7 @@ class install_install extends module unset($module_data['left_id']); unset($module_data['right_id']); - $module_data['parent_id'] = $row2['module_id']; + $module_data['parent_id'] = (int) $row2['module_id']; $_module->update_module_data($module_data, true); |