From f78ada83458d6361fb9ea42e62421b96f4edf9e6 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Wed, 2 Nov 2011 18:57:14 +0000
Subject: [PATCH] Fix bug reported on user list: <title> not escaped.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40132 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Buffer.cpp | 4 +++-
 status.20x     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 79b8ebd1ef..4b86241ab5 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1657,7 +1657,9 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
 		docstring const & doctitle = features.htmlTitle();
 		os << "<title>"
-		   << (doctitle.empty() ? from_ascii("LyX Document") : doctitle)
+		   << (doctitle.empty() ? 
+		         from_ascii("LyX Document") : 
+		         html::htmlize(doctitle, XHTMLStream::ESCAPE_ALL))
 		   << "</title>\n";
 
 		os << "\n<!-- Text Class Preamble -->\n"
diff --git a/status.20x b/status.20x
index 2880344d68..d31a51f9a8 100644
--- a/status.20x
+++ b/status.20x
@@ -162,6 +162,8 @@ What's new
 - Fix latex export of multilingual documents containing theorem-like
   environments (bug 7800).
 
+- Escape ampersands in <title> when outputting XHTML.
+
 
 * USER INTERFACE
 
-- 
2.39.5