mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
AliasHandler:
- initStruct(): revert the MariaDB workaround because PostfixAdmin now "thinks" none of the aliases belong to a mailbox (and displays all of them in the alias list, even the mailbox aliases) - reverts r1699 + the CHANGELOG entry (part of r1700) - reopened https://sourceforge.net/p/postfixadmin/bugs/325/ git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1702 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
0ca4c62d6d
commit
46a632ec02
@ -15,8 +15,8 @@ SVN changes since 3.0 beta1 (2.91)
|
||||
- AliasHandler: don't clean goto field when making alias inactive (bug#316)
|
||||
- list-virtual: display quota even if $CONF[used_quotas] == NO (bug#307)
|
||||
- vacation.pl: fix postgresql queries in vacation.pl (bug#315)
|
||||
- fix query in AliasHandler getList() which caused an empty list and init()
|
||||
which breaks deleting aliases in MariaDB (bug#313, bug#325)
|
||||
- fix query in AliasHandler getList() which caused an empty list in MariaDB
|
||||
(bug#313, bug#325)
|
||||
- fetchmail.pl: fix ssl extra options (cert check, cert path, fingerprint)
|
||||
- fix logging (run setup.php to fix old log entries) (bug#317)
|
||||
- fetchmail.php: change error_reporting() to exclude E_NOTICE (bug#322)
|
||||
|
@ -40,9 +40,8 @@ class AliasHandler extends PFAHandler {
|
||||
/*not_in_db*/ 0,
|
||||
/*dont_write_to_db*/ 1,
|
||||
/*select*/ 'coalesce(__is_mailbox,0) as is_mailbox',
|
||||
# "COUNT(1)" instead of just "1" needed for MariaDB, see https://sourceforge.net/p/postfixadmin/bugs/325/
|
||||
/*extrafrom*/ 'LEFT JOIN ( ' .
|
||||
' SELECT COUNT(1) as __is_mailbox, username as __mailbox_username ' .
|
||||
' SELECT 1 as __is_mailbox, username as __mailbox_username ' .
|
||||
' FROM ' . table_by_key('mailbox') .
|
||||
' WHERE username IS NOT NULL ' .
|
||||
' ) AS __mailbox ON __mailbox_username = address' ),
|
||||
|
Loading…
Reference in New Issue
Block a user