From 596b71237e809529a72e8582eba318ac77685051 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Fri, 28 Jan 2005 00:27:36 +0000 Subject: [PATCH] little bug wrt RSS Patches applied: * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-2 mini bug git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-401 --- include/rss.inc.php | 2 +- upgrade/0.9.4/20_register.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/rss.inc.php b/include/rss.inc.php index bda7c26..1a67e29 100644 --- a/include/rss.inc.php +++ b/include/rss.inc.php @@ -25,7 +25,7 @@ function _rss_encode_date($d) { } else { $t = strtotime($d); } - return date('r', $t); + return utf8_encode(date('r', $t)); } function to_rss ($s) diff --git a/upgrade/0.9.4/20_register.sql b/upgrade/0.9.4/20_register.sql index 7161389..5c521b2 100644 --- a/upgrade/0.9.4/20_register.sql +++ b/upgrade/0.9.4/20_register.sql @@ -49,10 +49,10 @@ create table register_mstats ( -- insert into register_mstats (uid, sender, success) - select u.user_id, e.sender, u.date_ins + select distinct u.user_id, e.sender, u.date_ins from envoidirect as e inner join auth_user_md5 as u using(matricule) - where u.date_ins != 0; + where u.date_ins != 0 group by user_id; insert into register_marketing (uid, sender, email, date, last, nb, type, hash) select u.user_id, m.expe, m.email, 0, 0, FIND_IN_SET('envoye', m.flags), IF(FIND_IN_SET('mail_perso', m.flags), 'user', 'staff'), '' -- 2.1.4