Changeset 22951

Timestamp:

2010-09-23T17:22:05+12:00 (13 years ago)

Author:

davidb

Message:

Encode::decode cannot be applied to all characters returned by ghtml::getcharequiv(). If getcharequiv does not recognize a character then it does not encode it, and so we cannot apply decode() to it. getcharequiv() upgraded to include an optional extra param that says whether or not to decode the equiv char should there be one it can map it to.

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -1232 +1232 @@
     # Convert entities to their UTF8 equivalents
     $$textref =~ s/&(lt|gt|amp|quot|nbsp);/&z$1;/go;
-    $$textref =~ s/&([^;]+);/&Encode::decode("utf8",ghtml::getcharequiv($1,1))/gseo;
+    $$textref =~ s/&([^;]+);/&ghtml::getcharequiv($1,1,1)/gseo;
     $$textref =~ s/&z(lt|gt|amp|quot|nbsp);/&$1;/go;