From 76ff89621cdab2cefcadd2ae247ec682fdb415b1 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 4 Dec 2004 23:26:46 +0000 Subject: [PATCH] bug wrt homonymes git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-43 --- include/email.classes.inc.php | 2 +- upgrade/0.9.3/10_aliases.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/email.classes.inc.php b/include/email.classes.inc.php index 49a24ee..527cdda 100644 --- a/include/email.classes.inc.php +++ b/include/email.classes.inc.php @@ -64,7 +64,7 @@ function fix_bestalias($uid) } $globals->db->query("UPDATE aliases SET flags=CONCAT(flags,',','bestalias') - WHERE id='$uid' + WHERE id='$uid' AND type!='homonyme' ORDER BY !FIND_IN_SET('epouse',flags),alias LIKE '%.%', LENGTH(alias) LIMIT 1"); } diff --git a/upgrade/0.9.3/10_aliases.sql b/upgrade/0.9.3/10_aliases.sql index ee78f77..a8d8471 100644 --- a/upgrade/0.9.3/10_aliases.sql +++ b/upgrade/0.9.3/10_aliases.sql @@ -7,4 +7,4 @@ alter table aliases add index (flags); update aliases AS a left join aliases AS b ON(a.id=b.id and b.alias like '%.%' and length(b.alias)