aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-06-04 16:30:58 +0000
committerNils Adermann <naderman@naderman.de>2006-06-04 16:30:58 +0000
commit5c181bc5289c54322d61dcc008e539f7c32e882b (patch)
tree440352ec19a1035388d00945da85a38731e04897 /phpBB/includes/acp/acp_users.php
parentf3499d12518c38082c2ecf60958e7336195a941b (diff)
downloadforums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar
forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.gz
forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.bz2
forums-5c181bc5289c54322d61dcc008e539f7c32e882b.tar.xz
forums-5c181bc5289c54322d61dcc008e539f7c32e882b.zip
- permission trace correctly uses language variables now
- updated documentation for the auth class - use cache for "SELECT forum_name FROM phpbb_forums WHERE forum_id = X" queries everywhere and not only in functions_display - updated the permission trace to include information about global settings overwriting local ones - take global permissions into account for local permission results on the view permission pages for users - only allow to change the post author with m_chgposter git-svn-id: file:///svn/phpbb/trunk@6009 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1a079b8e0d..071996d192 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -546,7 +546,7 @@ class acp_users
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . "
WHERE forum_id = $new_forum_id";
- $result = $db->sql_query($sql);
+ $result = $db->sql_query($sql, 3600);
$forum_info = $db->sql_fetchrow($result);
$db->sql_freeresult($result);