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

#8618 + padding store check

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7163 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-03-10 14:31:15 +00:00
parent 2d12eae461
commit 6098703c37
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions.php
View file

@ -302,7 +302,9 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list
} }
else if ($row['left_id'] > $right + 1) else if ($row['left_id'] > $right + 1)
{ {
$padding = $padding_store[$row['parent_id']]; // Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it.
// @todo digging deep to find out "how" this can happen.
$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding;
} }
$right = $row['right_id']; $right = $row['right_id'];

10
phpBB/install/index.php
View file

@ -255,6 +255,9 @@ class module
$this->error('No installation modules found', __LINE__, __FILE__); $this->error('No installation modules found', __LINE__, __FILE__);
} }
// Order to use and count further if modules get assigned to the same position or not having an order
$max_module_order = 1000;
foreach ($module as $row) foreach ($module as $row)
{ {
// Check any module pre-reqs // Check any module pre-reqs
@ -262,6 +265,13 @@ class module
{ {
} }
// Module order not specified or module already assigned at this position?
if (!isset($row['module_order']) || isset($this->module_ary[$row['module_order']]))
{
$row['module_order'] = $max_module_order;
$max_module_order++;
}
$this->module_ary[$row['module_order']]['name'] = $row['module_title']; $this->module_ary[$row['module_order']]['name'] = $row['module_title'];
$this->module_ary[$row['module_order']]['filename'] = $row['module_filename']; $this->module_ary[$row['module_order']]['filename'] = $row['module_filename'];
$this->module_ary[$row['module_order']]['subs'] = $row['module_subs']; $this->module_ary[$row['module_order']]['subs'] = $row['module_subs'];