diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-09 16:29:30 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-09 16:29:30 +0000 |
| commit | 700347738c61bc98472c1860e1f5ec129a5a467f (patch) | |
| tree | d0ea0c356f50ae564a487f71fff73982f9f0f6bc /phpBB | |
| parent | d5a7d20579cb4edc1ca9063f36e0417717be5200 (diff) | |
| download | forums-700347738c61bc98472c1860e1f5ec129a5a467f.tar forums-700347738c61bc98472c1860e1f5ec129a5a467f.tar.gz forums-700347738c61bc98472c1860e1f5ec129a5a467f.tar.bz2 forums-700347738c61bc98472c1860e1f5ec129a5a467f.tar.xz forums-700347738c61bc98472c1860e1f5ec129a5a467f.zip | |
merging r10260
Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10261 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 |
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( |