makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#9659

Browse source 
#9569


git-svn-id: file:///svn/phpbb/trunk@7302 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-04-08 15:14:50 +00:00
parent 539ac00f02
commit 281c8763bd
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/acp/acp_modules.php
View file

@ -721,7 +721,6 @@ class acp_modules
if (!isset($module_data['module_id'])) if (!isset($module_data['module_id']))
{ {
// no module_id means we're creating a new category/module // no module_id means we're creating a new category/module
if ($module_data['parent_id']) if ($module_data['parent_id'])
{ {
$sql = 'SELECT left_id, right_id $sql = 'SELECT left_id, right_id
@ -754,8 +753,8 @@ class acp_modules
AND {$row['left_id']} BETWEEN left_id AND right_id"; AND {$row['left_id']} BETWEEN left_id AND right_id";
$db->sql_query($sql); $db->sql_query($sql);
$module_data['left_id'] = $row['right_id']; $module_data['left_id'] = (int) $row['right_id'];
$module_data['right_id'] = $row['right_id'] + 1; $module_data['right_id'] = (int) $row['right_id'] + 1;
} }
else else
{ {
@ -766,8 +765,8 @@ class acp_modules
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$module_data['left_id'] = $row['right_id'] + 1; $module_data['left_id'] = (int) $row['right_id'] + 1;
$module_data['right_id'] = $row['right_id'] + 2; $module_data['right_id'] = (int) $row['right_id'] + 2;
} }
$sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data); $sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data);

2
phpBB/includes/functions_convert.php
View file

@ -1194,7 +1194,7 @@ function restore_config($schema)
{ {
if (preg_match('/(.*)\((.*)\)/', $src, $m)) 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 . ');'; $exec = '$config_value = ' . $m[1] . '(' . $var . ');';
eval($exec); eval($exec);
} }

12
phpBB/install/install_install.php
View file

@ -1415,7 +1415,7 @@ class install_install extends module
$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); $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; $categories[$cat_name]['parent_id'] = 0;
// Create sub-categories... // Create sub-categories...
@ -1427,7 +1427,7 @@ class install_install extends module
'module_basename' => '', 'module_basename' => '',
'module_enabled' => 1, 'module_enabled' => 1,
'module_display' => 1, 'module_display' => 1,
'parent_id' => $categories[$cat_name]['id'], 'parent_id' => (int) $categories[$cat_name]['id'],
'module_class' => $module_class, 'module_class' => $module_class,
'module_langname' => $level2_name, 'module_langname' => $level2_name,
'module_mode' => '', 'module_mode' => '',
@ -1443,8 +1443,8 @@ class install_install extends module
$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
} }
$categories[$level2_name]['id'] = $module_data['module_id']; $categories[$level2_name]['id'] = (int) $module_data['module_id'];
$categories[$level2_name]['parent_id'] = $categories[$cat_name]['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_basename' => $module_basename,
'module_enabled' => 1, 'module_enabled' => 1,
'module_display' => (isset($row['display'])) ? $row['display'] : 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_class' => $module_class,
'module_langname' => $row['title'], 'module_langname' => $row['title'],
'module_mode' => $module_mode, 'module_mode' => $module_mode,
@ -1569,7 +1569,7 @@ class install_install extends module
unset($module_data['left_id']); unset($module_data['left_id']);
unset($module_data['right_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); $_module->update_module_data($module_data, true);