From 3a76fdbc6fe1eb50ee96796508faa6652451aae2 Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 26 Mar 2009 15:30:15 +0000 Subject: [PATCH] Backport r12684 from trunk: escape raw ampersands as part of entityize git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@12686 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm index e9bb29bec5..1d7895a013 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm @@ -1510,6 +1510,9 @@ sub entityize { $string = NFC($string); } + # Convert raw ampersands to ampersand entities + $string =~ s/&(?!\S+;)/&/gso; + $string =~ s/([\x{0080}-\x{fffd}])/sprintf('&#x%X;',ord($1))/sgoe; return $string; } -- 2.11.0