aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-11-09 16:23:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-11-09 16:23:15 +0000
commita691f4c8bccccf2916aa5a0e1e36f69a97f36a2f (patch)
treed0ea0c356f50ae564a487f71fff73982f9f0f6bc
parentb39f618001b54a0213e2c80e70e85dd49ffc6fe6 (diff)
downloadforums-a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f.tar
forums-a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f.tar.gz
forums-a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f.tar.bz2
forums-a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f.tar.xz
forums-a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f.zip
Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10260 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_admin.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c28611fd6b..becfa021c6 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -213,6 +213,7 @@
<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
<li>[Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)</li>
+ <li>[Fix] Fix sql error in cache_moderators() if using postgresql. (Bug #53765)</li>
<li>[Change] Database updater now supports checking for existing/missing indexes.</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
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(