Commits

Zhang Huangbin committed 2c8d855

Fixed: Cannot delete alias account.
Thanks svanrijn _at_ ictgrouphhw.nl for the report.

Comments (0)

Files changed (3)

ChangeLog.dbmail_mysql

+= 1.0.2 =
+    * Fixed:
+        + Cannot delete alias account.
+          Thanks svanrijn _at_ ictgrouphhw.nl for the report.
+
 = 1.0.1 =
     * Fixed:
         + Cannot handle timezones with minutes. e.g. GMT+5:45.

i18n/translation.sh

 #!/usr/bin/env bash
 
 # =========================================================
-# Author:    Zhang Huangbin (michaelbibby@gmail.com)
+# Author:    Zhang Huangbin (zhb@iredmail.org)
 # =========================================================
 
 #---------------------------------------------------------------------

libs/dbmail_mysql/alias.py

 
         # Delete domain and related records.
         try:
-            self.conn.delete('dbmail_aliases_extra', where='%s' % web.sqlors('alias = ', self.sqlMails),)
-            self.conn.delete('dbmail_aliases', where='%s' % web.sqlors('alias = ', self.sqlMails),)
+            self.conn.delete('dbmail_aliases_extra', where='%s' % web.sqlors('alias = ', self.mails),)
+            self.conn.delete('dbmail_aliases', where='%s' % web.sqlors('alias = ', self.mails),)
             self.conn.update('dbmail_domains',
                              defaultuseraliases=','.join(self.newDefaultAliases),
                              modified=iredutils.sqlNOW,