From 3cb802d737f733d253b47d5c0dcdaca467fc056d Mon Sep 17 00:00:00 2001
From: "mozilla.BenB%bucksch.org"
 <mozilla.BenB%bucksch.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 Sep 2007 17:51:22 +0000
Subject: [PATCH] Bug 245758: Make bookmarks' internal unescaper match
 nsEscapeHTML, unescaping ' pr r=Neil Rashbrook, sr=jst

git-svn-id: svn://10.0.0.236/trunk@235877 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/src/nsBookmarksService.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mozilla/suite/browser/src/nsBookmarksService.cpp b/mozilla/suite/browser/src/nsBookmarksService.cpp
index 40602557a05..72f8442ea03 100644
--- a/mozilla/suite/browser/src/nsBookmarksService.cpp
+++ b/mozilla/suite/browser/src/nsBookmarksService.cpp
@@ -971,6 +971,11 @@ BookmarkParser::Unescape(nsString &text)
             text.Cut(offset, 6);
             text.Insert(PRUnichar('\"'), offset);
         }
+        else if (Substring(text, offset, 5).Equals(NS_LITERAL_STRING("&#39;")))
+        {
+            text.Cut(offset, 5);
+            text.Insert(PRUnichar('\''), offset);
+        }
 
         ++offset;
     }