bug 420, nom d'epouse sur le trombi promo

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@334 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 4f483f2..7e2c4d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,13 +49,13 @@ Bug/Wish :
     * Lists :
         - #396, #416: Making moderating ML messages easier.                 -Car
 
+    * Newsletter :
+        - #410: In Html newsletter add a link to go back to summary.        -Car
+
     * Profile :
         - #400: Several phones for each address.                            -Car
         - #406: Direct link in owner's fiche to edit it.                    -Car
 
-    * Newsletter :
-        - #410: In Html newsletter add a link to go back to summary.        -Car
-
     * RSS :
         - #398: "Add to contact" doesn't appear for deaths.                 -Car
 
@@ -65,6 +65,9 @@ Bug/Wish :
     * Search :
         - #412: Error SQL in big referent searches.                         -Car
 
+    * Trombi :
+        - #420: Promo trombi shows usage name.                              -Car
+
     * Wiki :
         - #403: Cache is cleared when editing a page.                       -Car
 

diff --git a/htdocs/trombipromo.php b/htdocs/trombipromo.php
index 0472334..f7f1969 100644 (file)
--- a/htdocs/trombipromo.php
+++ b/htdocs/trombipromo.php
@@ -38,7 +38,7 @@ function getList($offset,$limit) {
     $pnb = $res->fetchOneCell();
 
     $res = $globals->xdb->query(
-            "SELECT  promo,user_id,a.alias AS forlife,nom,prenom
+            "SELECT  promo,user_id,a.alias AS forlife,IF(nom_usage='', nom, nom_usage) AS nom,prenom
                FROM  photo         AS p
          INNER JOIN  auth_user_md5 AS u ON u.user_id=p.uid
          INNER JOIN  aliases       AS a ON ( u.user_id=a.id AND a.type='a_vie' )