Author: acydburn
Date: Mon Nov 9 16:29:30 2009
New Revision: 10261
Log:
merging r10260
Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
Modified:
branches/phpBB-3_0_6/phpBB/ (props changed)
branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_6/phpBB/includes/functions_admin.php
Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
svn:mergeinfo = /branches/phpBB-3_0_0/phpBB:10260
Modified: branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_6/phpBB/docs/CHANGELOG.html Mon Nov 9 16:29:30 2009
***************
*** 213,218 ****
--- 213,219 ----
<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>
Modified: branches/phpBB-3_0_6/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_6/phpBB/includes/functions_admin.php Mon Nov 9 16:29:30 2009
***************
*** 2361,2368 ****
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
- ACL_GROUPS_TABLE => 'a',
GROUPS_TABLE => 'g',
),
'LEFT_JOIN' => array(
--- 2361,2368 ----
'FROM' => array(
ACL_OPTIONS_TABLE => 'o',
USER_GROUP_TABLE => 'ug',
GROUPS_TABLE => 'g',
+ ACL_GROUPS_TABLE => 'a',
),
'LEFT_JOIN' => array(
|
