X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnotifs.inc.php;h=0bcf6550e61a5bc1722a422a5cf3fffc34fdf4e2;hb=730a173a333507926e0029d8a96c3a26b55756e4;hp=95ae89cabed49746088af648a46dbc9513d19f54;hpb=a7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe;p=platal.git diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 95ae89c..0bcf655 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -82,7 +82,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, + u.deces != 0 AS dcd, (u.flags = 'femme') AS sexe, a.alias AS bestalias, wo.*, {$our['contact_sql']} AS contact, @@ -90,7 +90,7 @@ function _select_notifs_base($table, $mail, $where) if ($mail) { $sql.=", w.uid AS aid, v.prenom AS aprenom, IF(v.nom_usage='',v.nom,v.nom_usage) AS anom, - b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt"; + b.alias AS abestalias, (v.flags='femme') AS asexe, q.core_mail_fmt AS mail_fmt"; } $sql .= " @@ -203,10 +203,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['asexe'], 'mail_fmt' => $tmp['mail_fmt'], 'dcd'=>$tmp['dcd']); } - unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt'], $tmp['dcd']); + unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['asexe'], $tmp['mail_fmt'], $tmp['dcd']); $this->_data[$aid]['data'][$tmp['cid']][] = $tmp; } }