From 3ce06e37f07bbda02cb3ee30577333801a6d1b9c Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 28 Jun 2008 00:03:59 +0200 Subject: [PATCH] Fix vcard generation: only users with a valid forlife are added (Closes #846) Signed-off-by: Florent Bruneau --- include/vcard.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/vcard.inc.php b/include/vcard.inc.php index a4366fc..ccb8526 100644 --- a/include/vcard.inc.php +++ b/include/vcard.inc.php @@ -37,8 +37,11 @@ class VCardIterator implements PlIterator public function add_user($user) { - $this->user_list[] = get_user_forlife($user); - $this->count++; + $forlife = get_user_forlife($user, '_silent_user_callback'); + if ($forlife) { + $this->user_list[] = get_user_forlife($user); + $this->count++; + } } public function first() @@ -172,7 +175,6 @@ class VCard header("Pragma: "); header("Cache-Control: "); header("Content-type: text/x-vcard; charset=UTF-8"); - header("Content-Transfer-Encoding: 8bit"); } } -- 2.1.4