diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-04 16:30:58 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-04 16:30:58 +0000 |
| commit | 5c181bc5289c54322d61dcc008e539f7c32e882b (patch) | |
| tree | 440352ec19a1035388d00945da85a38731e04897 /phpBB/includes/functions_admin.php | |
| parent | f3499d12518c38082c2ecf60958e7336195a941b (diff) | |
| download | forums-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/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 82479f0fcf..ada8809b74 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1721,7 +1721,7 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr $sql = 'SELECT forum_name FROM ' . FORUMS_TABLE . " WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); + $result = $db->sql_query($sql, 3600); if ($row = $db->sql_fetchrow($result)) { |