From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 16 Feb 2014 18:10:43 +0000 (+0100)
Subject: Don't select a postal address for ax_mail when delivery failed
X-Git-Tag: xorg/1.1.12~29
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=821ec02450f959b88d6c0e40199a696cff216e43;p=platal.git

Don't select a postal address for ax_mail when delivery failed
---

diff --git a/classes/address.php b/classes/address.php
index 7f26507..0b3ae04 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -743,7 +743,8 @@ class Address
         $ax_mail = XDB::fetchOneAssoc("SELECT  pid, jobid, groupid, type, id
                                          FROM  profile_addresses
                                         WHERE  pub IN ('public', 'ax') AND FIND_IN_SET('mail', flags) AND pid = {?}
-                                     ORDER BY  NOT FIND_IN_SET('current', flags),
+                                     ORDER BY  FIND_IN_SET('deliveryIssue', flags),
+                                               NOT FIND_IN_SET('current', flags),
                                                FIND_IN_SET('secondary', flags), type = 'job'",
                                       $this->pid);