aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:41 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:41 +0100
commit6606e4bffe91637701499afef34e9c847aa3a3b0 (patch)
tree57ff80146af23c0c8e7b159718d3ef78dd4fe6b7 /phpBB/includes/functions_admin.php
parent723e38ece20f7a7a3611b86a4feafeb28560ce02 (diff)
parent338559baca27ef4954898b824845d51bc536c9a6 (diff)
downloadforums-6606e4bffe91637701499afef34e9c847aa3a3b0.tar
forums-6606e4bffe91637701499afef34e9c847aa3a3b0.tar.gz
forums-6606e4bffe91637701499afef34e9c847aa3a3b0.tar.bz2
forums-6606e4bffe91637701499afef34e9c847aa3a3b0.tar.xz
forums-6606e4bffe91637701499afef34e9c847aa3a3b0.zip
Merge commit 'release-3.0.6'
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 92dcf60ee0..ddadda8ed2 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2361,8 +2361,8 @@ function cache_moderators()
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
- ACL_GROUPS_TABLE => 'a',
GROUPS_TABLE => 'g',
+ ACL_GROUPS_TABLE => 'a',
),
'LEFT_JOIN' => array(