From eed9d294d24f1ffed09adf38f0976764a047d142 Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Fri, 10 Nov 2017 12:17:27 +0100
Subject: [PATCH] dev #65273 : ensure utf-8 encoding of numeric entities

---
 library/Class/ICal/Event.php                                  | 2 +-
 .../opac/controllers/CmsControllerCalendarActionTest.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Class/ICal/Event.php b/library/Class/ICal/Event.php
index 16e0f7f58f9..b7f4eecc307 100644
--- a/library/Class/ICal/Event.php
+++ b/library/Class/ICal/Event.php
@@ -55,7 +55,7 @@ class Class_ICal_Event extends \Eluceo\iCal\Component\Event {
       $event->setGeoLocation(new \Eluceo\iCal\Property\Event\Geo($latitude, $longitude));
 
     $text_description = html_entity_decode(strip_tags($article->getFullContent()),
-                                           ENT_COMPAT|ENT_HTML401,
+                                           ENT_QUOTES|ENT_XHTML,
                                            'UTF-8');
     $event->setDescription($text_description);
     $event->setDescriptionHTML($article->getFullContent());
diff --git a/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php b/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
index 3d7f380a225..748e34bc641 100644
--- a/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
@@ -872,7 +872,7 @@ class CmsControllerCalendarActionIcalExportRecurrentAllDayTest
     $opac4 = $this->fixture('Class_Article',
                             ['id' => 5,
                              'titre' => 'OPAC 4 en prod !',
-                             'contenu' => '<h3>youpi &amp; oui &ccedil;a déchire !</h3><img src="/userfiles/images/youpi.png">',
+                             'contenu' => '<h3>youpi &amp; oui c&#39;est beau !</h3><img src="/userfiles/images/youpi.png">',
                              'lieu' => $this->annecy,
                              'all_day' => 1,
                              'pick_day' => '1,3,0',
@@ -933,7 +933,7 @@ class CmsControllerCalendarActionIcalExportRecurrentAllDayTest
 
   /** @test */
   public function descriptionShouldBeYoupiWithoutHtml() {
-    $this->assertContains('DESCRIPTION:youpi & oui ça déchire !', $this->_ical);
+    $this->assertContains('DESCRIPTION:youpi & oui c\'est beau !', $this->_ical);
   }
 
 
-- 
GitLab