aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/auth.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-02 15:36:43 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-02 15:36:43 +0000
commit7c8f4431d346ed17ae9d8b8c13bd27987913f386 (patch)
tree04b39f18ccc282f0bd902381c3b1c9200008ca5c /phpBB/includes/acp/auth.php
parentc83a2fa1d3acf39efdb1441f4049e0825aa23a9b (diff)
downloadforums-7c8f4431d346ed17ae9d8b8c13bd27987913f386.tar
forums-7c8f4431d346ed17ae9d8b8c13bd27987913f386.tar.gz
forums-7c8f4431d346ed17ae9d8b8c13bd27987913f386.tar.bz2
forums-7c8f4431d346ed17ae9d8b8c13bd27987913f386.tar.xz
forums-7c8f4431d346ed17ae9d8b8c13bd27987913f386.zip
only very tiny fixes.
git-svn-id: file:///svn/phpbb/trunk@6956 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/auth.php')
-rw-r--r--phpBB/includes/acp/auth.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index b32d435d7b..375a9c9ba3 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -264,7 +264,7 @@ class auth_admin extends auth
{
$hold_ary[$row['forum_id']]['groups'][] = $row['group_id'];
}
- $db->sql_freeresult($result);
+ $db->sql_freeresult($result);
return $hold_ary;
}
@@ -620,6 +620,12 @@ class auth_admin extends auth
foreach ($hold_ary as $forum_id => $auth_ary)
{
+ // If there is no forum present the database holds auth information for a non-existent forum... continue then
+ if ($forum_id && !isset($forum_names[$forum_id]))
+ {
+ continue;
+ }
+
$template->assign_block_vars('role_mask', array(
'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id],
'FORUM_ID' => $forum_id)