www

commit be4d56e43b683b2257af48a40a39b68c2fa6da93
parent 46ff2f464d974e203869b110e66f25df438f1ffb
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 12 Jun 2015 05:35:36 -0400

Merge pull request #761 from aurimasv/snapshot-utf8

Always save snapshots in UTF-8 encoding
Diffstat:
M
chrome/content/zotero/webpagedump/domsaver.js
 | 
2
+-
M
chrome/content/zotero/xpcom/attachments.js
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
@@ -199,7 +199,7 @@ var wpdDOMSaver = {
 			// Changed by Dan for Zotero
 			"script": true, // no scripts
 
-			"encodeUTF8": false, // write the DOM Tree as UTF-8 and change the charset entry of the document
+			"encodeUTF8": true, // write the DOM Tree as UTF-8 and change the charset entry of the document
 			"metainfo": true, // include meta tags with URL and date/time information
 			"metacharset": false // if the meta charset is defined inside html override document charset
 			//"xtagging"    : true      // include a x tag around each word
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
@@ -540,7 +540,7 @@ Zotero.Attachments = new function(){
 			mimeType = "application/pdf";
 		}
 		
-		var charsetID = Zotero.CharacterSets.getID(document.characterSet);
+		var charsetID = Zotero.CharacterSets.getID('utf-8'); // WPD will output UTF-8
 		
 		if (!forceTitle) {
 			// Remove e.g. " - Scaled (-17%)" from end of images saved from links,