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

Bug #12337

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7758 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-06-15 11:07:25 +00:00
parent 8b9ae08449
commit ae0bf42808
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/docs/CHANGELOG.html
View file

@ -274,7 +274,9 @@ p a {
<li>[Fix] Correctly re-assign query result id after seeking rows (MSSQL/Firebird) (Bug #12369)</li> <li>[Fix] Correctly re-assign query result id after seeking rows (MSSQL/Firebird) (Bug #12369)</li>
<li>[Feature] Make effect of a changed hideonline permission instantaneous</li> <li>[Feature] Make effect of a changed hideonline permission instantaneous</li>
<li>[Fix] Do not overwrite larger memory values in the installer (Bug #12195)</li> <li>[Fix] Do not overwrite larger memory values in the installer (Bug #12195)</li>
</ul> <li>[Fix] Order forums on role permission mask (Bug #12337)</li>
</ul>
</div> </div>
<a href="#top">Top</a> <a href="#top">Top</a>

13
phpBB/includes/acp/auth.php
View file

@ -587,7 +587,8 @@ class auth_admin extends auth
// Get forum names // Get forum names
$sql = 'SELECT forum_id, forum_name $sql = 'SELECT forum_id, forum_name
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)); WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)) . '
ORDER BY left_id';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$forum_names = array(); $forum_names = array();
@ -597,16 +598,12 @@ class auth_admin extends auth
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
foreach ($hold_ary as $forum_id => $auth_ary) foreach ($forum_names as $forum_id => $forum_name)
{ {
// If there is no forum present the database holds auth information for a non-existent forum... continue then $auth_ary = $hold_ary[$forum_id];
if ($forum_id && !isset($forum_names[$forum_id]))
{
continue;
}
$template->assign_block_vars('role_mask', array( $template->assign_block_vars('role_mask', array(
'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id], 'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_name,
'FORUM_ID' => $forum_id) 'FORUM_ID' => $forum_id)
); );