From: blake <blake@mobiusconsortium.org>
Date: Thu, 17 Nov 2016 20:04:16 +0000 (-0600)
Subject: LP1642721 SIP Ubuntu 16.04 Encode issue decode_utf8
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2ccab860b0ca54b8bd848472c0913376292ba3f0;p=working%2FEvergreen.git

LP1642721 SIP Ubuntu 16.04 Encode issue decode_utf8

New versions of Encode.pm do not allow decoding already decoded strings.
This change fixed our SIP server in production.

Signed-off-by: blake <blake@mobiusconsortium.org>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
index 81307f4e5b..9f602afaab 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
@@ -150,7 +150,7 @@ sub clean_text {
     # and latin-1 encodings (at least) require this to substitute
     # characters rather than simply returning a string truncated
     # after the first non-ASCII character
-    $text = NFD(decode_utf8($text));
+    $text = NFD($text);
 
     if ($target_encoding eq 'ascii') {