mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
git-svn-id: file:///svn/phpbb/trunk@7775 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
2599387b28
commit
5f62e8feda
3 changed files with 22 additions and 1 deletions
|
@ -282,6 +282,7 @@ p a {
|
|||
<li>[Fix] Custom BBCodes properly handle lowercasing of parameterized tags (Bug #12377)</li>
|
||||
<li>[Fix] Update the forum_id sequence for PostgreSQL during conversion (Bug #11927)</li>
|
||||
<li>[Fix] Allow for multiple tags containing URL and LOCAL_URL tokens (Bug #12473)</li>
|
||||
<li>[Fix] Properly display forum list in the MCP Queue (Bug #11313)</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
|
|
@ -257,11 +257,31 @@ function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only =
|
|||
$result = $db->sql_query($sql, $expire_time);
|
||||
|
||||
$forum_rows = array();
|
||||
|
||||
$right = $padding = 0;
|
||||
$padding_store = array('0' => 0);
|
||||
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
if ($row['left_id'] < $right)
|
||||
{
|
||||
$padding++;
|
||||
$padding_store[$row['parent_id']] = $padding;
|
||||
}
|
||||
else if ($row['left_id'] > $right + 1)
|
||||
{
|
||||
// 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'];
|
||||
$row['padding'] = $padding;
|
||||
|
||||
$forum_rows[] = $row;
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
unset($padding_store);
|
||||
}
|
||||
|
||||
$rowset = array();
|
||||
|
|
|
@ -274,7 +274,7 @@ class mcp_queue
|
|||
$forum_options = '<option value="0"' . (($forum_id == 0) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_FORUMS'] . '</option>';
|
||||
foreach ($forum_list_approve as $row)
|
||||
{
|
||||
$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . $row['forum_name'] . '</option>';
|
||||
$forum_options .= '<option value="' . $row['forum_id'] . '"' . (($forum_id == $row['forum_id']) ? ' selected="selected"' : '') . '>' . str_repeat(' ', $row['padding']) . $row['forum_name'] . '</option>';
|
||||
}
|
||||
|
||||
$sort_days = $total = 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue