ajouter mes contacts n'apparait plus pour les morts, bug 398

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

diff --git a/ChangeLog b/ChangeLog
index c0089c0..2c18ae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ Bug/Wish :
     * 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
+
     * Search :
         - #412: Error SQL in big referent searches.                         -Car
 

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index ab40e9f..46a3aaf 100644 (file)
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -78,6 +78,7 @@ function _select_notifs_base($table, $mail, $where)
     $sql = "
         (
           SELECT  u.promo, u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom,
+                  u.deces != 0 AS dcd,
                   a.alias AS bestalias,
                   wo.*,
                   {$our['contact_sql']} AS contact,
@@ -174,9 +175,10 @@ class AllNotifs {
            $aid = $tmp['aid'];
             if (empty($this->_data[$aid])) {
                 $this->_data[$aid] = Array("prenom" => $tmp['aprenom'], 'nom' => $tmp['anom'],
-                        'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe'], 'mail_fmt' => $tmp['mail_fmt']);
+                        'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe'], 'mail_fmt' => $tmp['mail_fmt'],
+                        'dcd'=>$tmp['dcd']);
             }
-           unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt']);
+           unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt'], $tmp['dcd']);
            $this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
        }
     }

diff --git a/templates/carnet/rss.tpl b/templates/carnet/rss.tpl
index ef669e1..0b35b06 100644 (file)
--- a/templates/carnet/rss.tpl
+++ b/templates/carnet/rss.tpl
@@ -60,7 +60,7 @@
       </title>
       <link>{#globals.baseurl#}/fiche.php?user={$x.bestalias}</link>
       <description><![CDATA[
-        {if !$x.contact}
+        {if !$x.contact and !$x.dcd}
         <a href="{#globals.baseurl#}/carnet/mescontacts.php?action=ajouter&amp;user={$x.bestalias}">
           ajouter &agrave; mes contacts
         </a>