Always use ENT_SUBSTITUTE for HTML escape

It's guaranteed to be present in 5.4+
omeka · Jan 27, 2020 · 72f1730 · 72f1730
1 parent 5d6bdc6
commit 72f1730
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/application/views/scripts/functions.php b/application/views/scripts/functions.php
@@ -1,16 +1,8 @@
 <?php
 
-// Use ENT_SUBSTITUTE when we're using a new-enough PHP version
-if (defined('ENT_SUBSTITUTE')) {
-    function utf8_htmlspecialchars($value)
-    {
-        return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-    }
-} else {
-    function utf8_htmlspecialchars($value)
-    {
-        return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
-    }
+function utf8_htmlspecialchars($value)
+{
+    return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
 }
 
 function show_untitled_items($title)