From: Quentin Smith <quentin@mit.edu>
Date: Sun, 25 Jan 2015 04:31:42 +0000 (-0500)
Subject: Check Encode version, not Perl version
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/af2f9fe19bd73b5c6e8ccfe2e4188c97e865c155

Check Encode version, not Perl version
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9e7cc06c7..f9ff68871 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -124,9 +124,9 @@ sub decode_cgi_utf8 ($) {
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;
-    # call decode_utf8 on >= 5.20 only if it's not already decoded,
-    # otherwise it balks, on < 5.20, always call it
-    if ($] < 5.02 || !Encode::is_utf8($octets)) {
+    # call decode_utf8 on Encode.pm >= 2.53 only if it's not already decoded,
+    # otherwise it balks, on < 2.53, always call it
+    if ($Encode::VERSION < 2.53 || !Encode::is_utf8($octets)) {
         return decode_utf8($octets);
     }
     else {