mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '3.0'

Browse source 
Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/translation/translate_item.js
	install.rdf
	update.rdf
This commit is contained in:
Dan Stillman 2012-11-23 01:49:32 -05:00
commit 4caae896cf
14 changed files with 121 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/zotero-protocol-handler.js
View file

@ -479,21 +479,7 @@ function ChromeExtensionHandler() {
default:
var content = Zotero.Report.generateHTMLDetails(items, combineChildItems);
// Serve invalid XML as text/html
//
// This is a temporary workaround until we figure out
// something better.
try {
var xml = new XML(content.replace(/^<\!DOCTYPE [^>]+>\n/, '').trim());
mimeType = 'application/xhtml+xml';
}
catch (e) {
Zotero.debug(e);
mimeType = 'text/html';
}
format = 'html';
mimeType = 'text/html';
}
}
catch (e){