SF.net SVN: postfixadmin:[1702] trunk

[<chr...@us...>]

Revision: 1702
          http://sourceforge.net/p/postfixadmin/code/1702
Author:   christian_boltz
Date:     2014-10-22 16:30:25 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
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/

Revision Links:
--------------
    http://sourceforge.net/p/postfixadmin/code/1699
    http://sourceforge.net/p/postfixadmin/code/1700

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/model/AliasHandler.php

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2014-10-22 15:33:33 UTC (rev 1701)
+++ trunk/CHANGELOG.TXT	2014-10-22 16:30:25 UTC (rev 1702)
@@ -15,8 +15,8 @@
 - 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)

Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php	2014-10-22 15:33:33 UTC (rev 1701)
+++ trunk/model/AliasHandler.php	2014-10-22 16:30:25 UTC (rev 1702)
@@ -40,9 +40,8 @@
                 /*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' ),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.