Merge branch 'dev' into plugin-check-updates

Author: brianhogg

.changelogs/fix_mb_convert_encoding.yml

@@ -0,0 +1,5 @@
+significance: minor
+type: fixed
+links:
+  - "#2672"
+entry: Removes use of deprecated mb_convert_encoding().

.wordpress-org/readme/05-description.md

@@ -1,8 +1,6 @@
 == Description ==
 LifterLMS is a secure easy-to-use WordPress LMS plugin packed with features to easily create & sell courses online.
 
-**[Download the LifterLMS plugin for free here](https://lifterlms.com/free/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)** directly from our website so you get instant access to all our valuable resources to help you get started quickly and easily for free.
-
 Turn your WordPress website into a professional eLearning platform with every customizable feature you could possibly need from your LMS.
 
 + **Intuitive LMS Course Builder:** Create Courses, Sections, and Interactive Lessons with multimedia content.
@@ -303,14 +301,15 @@ Connect LifterLMS to over 7,000 other apps like Facebook, Google Sheets, Zoom, S
 
 Save money and get more features.
 
-+ [Free LifterLMS plan](https://lifterlms.com/free/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale) gives you everything you need to start with all the essential LMS features from unlimited courses, memberships, students, teachers, and more.
++ Free LifterLMS plan gives you everything you need to start with all the essential LMS features from unlimited courses, memberships, students, teachers, and more.
 + [Earth Bundle](https://lifterlms.com/product/earth-bundle/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale) gives you all the essentials you need to get your online learning website up and running so it's collecting money today with the most powerful secure learning management system software.
 + Level up your online course LMS website with our ecommerce, design, marketing technology, and automation tools with the [Universe Bundle](https://lifterlms.com/product/universe-bundle/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale).
 + Add more engagement and student transformation potential to your immersive training programs with our entire suite of products including advanced features used by the best teachers, experts, and coaches with the [Infinity Bundle](https://lifterlms.com/product/infinity-bundle/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale).
 
 ### Try the Best LMS Plugin
 
-+ [Install the free core LifterLMS plugin right now](https://lifterlms.com/free/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale). See how extensive and customizable our free core plugin is.
++ Install the free core LifterLMS plugin right now. See how extensive and customizable our free core plugin is.
+
 + Get a temporary _30 Day_ website on our servers with the core LifterLMS plugin AND all the premium add-ons installed. This demo website allows you to test drive all the LMS add-ons before you invest. Practice creating courses, test out the learner experience, and see how easy it will be to manage your course with WordPress. Install your favorite plugins & themes to test compatibility. **[Try LifterLMS for $1](https://lifterlms.com/try/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)** now.
 + Test LifterLMS as a student. Take a **free** course on how to build a LifterLMS website in 20 minutes. [Take a Free Course](https://academy.lifterlms.com/course/how-to-build-a-learning-management-system-with-lifterlms/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale) now.
 
@@ -365,7 +364,7 @@ Want to add a new language to LifterLMS? Contribute language translations at [tr
 
 ### What Should You Do Next?
 
-**[Install the free LifterLMS plugin on your website](https://lifterlms.com/free/?utm_source=LifterLMS%20Plugin&utm_medium=README&utm_campaign=Readme%20to%20Sale)**,
+**Install the free LifterLMS plugin on your website**,
 
 then ...
 

includes/class-llms-dom-document.php

@@ -126,14 +126,16 @@ public function dom() {
 	}
 
 	/**
-	 * Load the HTML string in the DOMDocument using mb_convert_econding
+	 * Load the HTML string in the DOMDocument using mb_encode_numericentity
 	 *
 	 * @since 4.13.0
+	 * @since [version] Use `mb_encode_numericentity()` instead of deprecated `mb_convert_encoding()` with 'HTML-ENTITIES'.
 	 *
 	 * @return void
 	 */
 	private function load_with_mb_convert_encoding() {
-		if ( ! $this->dom->loadHTML( mb_convert_encoding( $this->source, 'HTML-ENTITIES', 'UTF-8' ) ) ) {
+		$html = mb_encode_numericentity( $this->source, array( 0x80, 0x10FFFF, 0, 0x1FFFFF ), 'UTF-8' );
+		if ( ! $this->dom->loadHTML( $html ) ) {
 			$this->error = new WP_Error( 'llms-dom-document-error', __( 'DOMDocument XML Error encountered.', 'lifterlms' ), libxml_get_errors() );
 		}
 	}