Changeset 31812 for main/trunk

Timestamp:

2017-07-20T16:16:44+12:00 (7 years ago)

Author:

ak19

Message:

The newer changes to Escape.pm's escape_char() that Dr Bainbridge found do work, my perl setup was wrong when I last tried it.

File:

• main/trunk/greenstone2/perllib/cpan/URI/Escape.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/cpan/URI/Escape.pm

@@ -204 +204 @@
 # https://rt.cpan.org/Public/Bug/Display.html?id=105109
 # https://github.com/libwww-perl/uri/commit/7e03cdd3e5d25df5556a36dbfcd5d6cbcd676afb
-# escape_char is buggy as it assigns meaning to the string's storage format.
+# XXX FIXME escape_char is buggy as it assigns meaning to the string's storage format.
 sub escape_char {
 
     # to fix new "\C is deprecated in regex" warning in 5.21.2 (RT#96941)
     #return join '', @URI::Escape::escapes{$_[0] =~ /(\C)/g};
+
+    # Old versions of utf8::is_utf8() didn't properly handle magical vars (e.g. $1).
+    # The following forces a fetch to occur beforehand.
+    my $dummy = substr($_[0], 0, 0);
+
     if (utf8::is_utf8($_[0])) {
-        my $s = $_[0];
+        my $s = shift;
         utf8::encode($s);
         unshift(@_, $s);
     }
-    
-    return join '', @URI::Escape::escapes{$_[0] =~ /(.)/sg};
+
+    return join '', @URI::Escape::escapes{split //, $_[0]};    
 }