From 8a235f4fc7585652a2e0c6fdb3d6cf0109a8da9a Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Mon, 29 Nov 2004 07:41:15 +0000 Subject: [PATCH] Attempt to fix broken non english RSS subjects. git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@165874 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/newsblog/content/FeedItem.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/mozilla/mail/extensions/newsblog/content/FeedItem.js b/mozilla/mail/extensions/newsblog/content/FeedItem.js index 96d0e9e0cf8..6143a59b902 100755 --- a/mozilla/mail/extensions/newsblog/content/FeedItem.js +++ b/mozilla/mail/extensions/newsblog/content/FeedItem.js @@ -305,13 +305,7 @@ FeedItem.prototype.writeToFolder = function() { // Convert the title to UTF-16 before performing our HTML entity replacement // reg expressions. - var title; - - try { - title = FeedItem.unicodeConverter.ConvertToUnicode(this.title); - } catch (ex) { - title = this.title; - } + var title = this.title + ">"; // the subject may contain HTML entities. // Convert these to their unencoded state. i.e. & becomes '&' @@ -323,14 +317,7 @@ FeedItem.prototype.writeToFolder = function() { // Compress white space in the subject to make it look better. title = title.replace(/[\t\r\n]+/g, " "); - // now convert back from utf-16 - try { - this.title = FeedItem.unicodeConverter.ConvertFromUnicode(title); - } catch (ex) { - this.title = title; - } - - this.title = this.mimeEncodeSubject(this.title, this.characterSet); + this.title = this.mimeEncodeSubject(title, this.characterSet); // If the date looks like it's in W3C-DTF format, convert it into // an IETF standard date. Otherwise assume it's in IETF format.