1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

- a few adjustments to permissions, specifically with regard to global topics

- forgot to change a line in permission trace [Bug #2100]
- syntax highlighting for php5
- [Bug #2093]


git-svn-id: file:///svn/phpbb/trunk@6028 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2006-06-09 19:20:51 +00:00
parent adc6d2a0c1
commit 753994810a
6 changed files with 12 additions and 14 deletions

View File

@@ -917,7 +917,7 @@ class acp_permissions
if ($user_id != $user->data['user_id'])
{
$sql = 'SELECT user_id, user_permissions, user_type
$sql = 'SELECT user_id, username, user_permissions, user_type
FROM ' . USERS_TABLE . '
WHERE user_id = ' . $user_id;
$result = $db->sql_query($sql);
@@ -1100,7 +1100,7 @@ class acp_permissions
if ($userdata['user_type'] == USER_FOUNDER && strpos($permission, 'a_') === 0)
{
$template->assign_block_vars('trace', array(
'WHO' => $user_row['username'],
'WHO' => $userdata['username'],
'INFORMATION' => $user->lang['TRACE_USER_FOUNDER'],
'S_SETTING_UNSET' => ($auth_setting == ACL_UNSET) ? true : false,