From 8048c981b9bebacf80b8a563a6a8449a657d4fa3 Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Wed, 12 Jun 2019 08:58:26 +0800
Subject: [PATCH] MDL-65752 lib: Update html2text to 4.2.1

---
 lib/html2text/Html2Text.php | 2 ++
 lib/thirdpartylibs.xml      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/html2text/Html2Text.php b/lib/html2text/Html2Text.php
index 5001b2ffd60..f279879d6f8 100644
--- a/lib/html2text/Html2Text.php
+++ b/lib/html2text/Html2Text.php
@@ -112,6 +112,7 @@ class Html2Text
         '/&#151;/i',                                     // m-dash in win-1252
         '/&(amp|#38);/i',                                // Ampersand: see converter()
         '/[ ]{2,}/',                                     // Runs of spaces, post-handling
+        '/&#39;/i',                                      // The apostrophe symbol
     );
 
     /**
@@ -125,6 +126,7 @@ class Html2Text
         '—',         // m-dash
         '|+|amp|+|', // Ampersand: see converter()
         ' ',         // Runs of spaces, post-handling
+        '\'',        // Apostrophe
     );
 
     /**
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 85d046baea2..e67a130b49c 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -172,7 +172,7 @@
     <location>html2text</location>
     <name>HTML2Text</name>
     <license>GPL</license>
-    <version>4.1.0</version>
+    <version>4.2.1</version>
     <licenseversion>2.0+</licenseversion>
   </library>
   <library>