From 45b5659471daf40e3b9e7270e7b66403a46f9e54 Mon Sep 17 00:00:00 2001 From: Kiran Prajapati Date: Tue, 23 Jan 2024 10:50:36 +0530 Subject: [PATCH 1/2] PHP Deprecated: mb_convert_encoding() - FIXED --- includes/libraries/class-emogrifier.php | 14 ++++++++------ readme.txt | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/libraries/class-emogrifier.php b/includes/libraries/class-emogrifier.php index 0750a3c42..c359225a4 100644 --- a/includes/libraries/class-emogrifier.php +++ b/includes/libraries/class-emogrifier.php @@ -338,11 +338,12 @@ public function emogrify() { $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument); if ($this->preserveEncoding) { - if ( function_exists( 'mb_convert_encoding' ) ) { + // Deprecated since PHP 8.2 + /*if ( function_exists( 'mb_convert_encoding' ) ) { return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' ); - } else { + } else {*/ return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) ); - } + //} } else { return $xmlDocument->saveHTML(); } @@ -539,11 +540,12 @@ private function getUnifiedHtml() { $bodyWithoutUnprocessableTags = $this->html; } - if ( function_exists( 'mb_convert_encoding' ) ) { + // Deprecated since PHP 8.2 + /*if ( function_exists( 'mb_convert_encoding' ) ) { return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING ); - } else { + } else {*/ return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) ); - } + //} } /** diff --git a/readme.txt b/readme.txt index 22b52aff1..079454e5b 100644 --- a/readme.txt +++ b/readme.txt @@ -309,6 +309,7 @@ __WARNING: GDv2 is a significant update over GDv1 and may require manual work, s * OSM layer url shows apikey parameter twice for custom style map - FIXED * Listing ad shows incorrect rating stars on Divi builder template - FIXED * Edit logo image title is not working on Chrome browser - FIXED +* PHP Deprecated: mb_convert_encoding() - FIXED = GeoDirectory v2.3.36 - 2024-01-09 = * GD > Categories category text style not working for image design type - FIXED From b66e64635574cb599860e5efcb6af7b041f1fa8e Mon Sep 17 00:00:00 2001 From: Kiran Prajapati Date: Tue, 23 Jan 2024 15:38:29 +0530 Subject: [PATCH 2/2] #2517 Astra theme conflicts on search page - FIXED --- includes/class-geodir-compatibility.php | 4 ++++ readme.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/includes/class-geodir-compatibility.php b/includes/class-geodir-compatibility.php index 22a8ac943..4d508b70b 100644 --- a/includes/class-geodir-compatibility.php +++ b/includes/class-geodir-compatibility.php @@ -1430,6 +1430,10 @@ public static function astra_single_layout_one_banner_visibility( $value ) { if ( $value && defined( 'ASTRA_THEME_VERSION' ) && version_compare( ASTRA_THEME_VERSION, '4.1', '>=' ) && ( geodir_is_page( 'post_type' ) || geodir_is_page( 'archive' ) || geodir_is_page( 'search' ) ) ) { $gd_astra_41_fix = true; $gd_skip_the_content = true; + + if ( geodir_is_page( 'search' ) ) { + $value = false; + } } return $value; diff --git a/readme.txt b/readme.txt index 079454e5b..276d1182e 100644 --- a/readme.txt +++ b/readme.txt @@ -310,6 +310,7 @@ __WARNING: GDv2 is a significant update over GDv1 and may require manual work, s * Listing ad shows incorrect rating stars on Divi builder template - FIXED * Edit logo image title is not working on Chrome browser - FIXED * PHP Deprecated: mb_convert_encoding() - FIXED +* Astra theme conflicts on search page - FIXED = GeoDirectory v2.3.36 - 2024-01-09 = * GD > Categories category text style not working for image design type - FIXED