From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 21 Sep 2011 16:09:12 +0000 (+0200)
Subject: Fixes birthday calendar downloading with IE (Closes #1534).
X-Git-Tag: xorg/1.1.4~141
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=009f4a24bd8743b2cf180b59cb2a2d90ff3f8640;p=platal.git

Fixes birthday calendar downloading with IE (Closes #1534).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index f782f94..37fdab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Bug/Wish:
 
     * Core:
         - #1523: Rename AUTH_MDP to AUTH_PASSWD                            -JAC
+        - #1534: Fixes birthday calendar downloading with IE               -JAC
 
     * Email:
         - #1529: Stores and uses preferences for sending emails from site  -JAC
diff --git a/modules/carnet.php b/modules/carnet.php
index 8db0fc2..d60d34d 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -396,7 +396,7 @@ class CarnetModule extends PLModule
         } else {
             $encoding = 'utf-8';
         }
-        pl_content_headers("text/comma-separated-values;charset=".$encoding);
+        pl_cached_content_headers('text/comma-separated-values; charset=' . $encoding, 1);
     }
 
     function handler_ical(PlPage $page, PlUser $user)
@@ -409,7 +409,7 @@ class CarnetModule extends PLModule
         $profiles = $filter->iterProfiles();
         $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef')));
 
-        pl_content_headers("text/calendar");
+        pl_cached_content_headers('text/calendar', 1);
     }
 
     function handler_vcard($page, $photos = null)