Merge branch 'release/5.0.0-beta.2' into v5

nystudio107 · Mar 27, 2024 · c938b2d · c938b2d
2 parents e117864 + 3d590c0
commit c938b2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Typogrify Changelog
 
+## 5.0.0-beta.2 - 2024.03.27
+### Fixed
+* Fixed a regression that happened when modernizing the `default_escape` functionality ([#86](https://github.com/nystudio107/craft-typogrify/issues/86))
+
 ## 5.0.0-beta.1 - 2024.03.27
 ### Added
 * Initial Craft CMS 5 compatibility
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-typogrify",
   "description": "Typogrify prettifies your web typography by preventing ugly quotes and 'widows' and more",
   "type": "craft-plugin",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/variables/TypogrifyVariable.php b/src/variables/TypogrifyVariable.php
@@ -309,8 +309,10 @@ private function normalizeText($text): string
 
         if ($settings && $settings['default_escape'] === true) {
             $twig = Craft::$app->getView()->getTwig();
-            $twig_escape_filter = $twig->getFilter('twig_escape_filter');
-            $text = $twig_escape_filter->getCallable()($twig, $text);
+            $twig_escape_filter = $twig->getFilter('e');
+            if ($twig_escape_filter) {
+                $text = $twig_escape_filter->getCallable()($twig, $text);
+            }
         }
 
         return $text;