From c5b4043155d1db7c290e0d56f2e6a0340b13521a Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sat, 14 Jan 2012 00:34:08 -0500
Subject: [PATCH] Fix setDocPrefs, part 2

---
 chrome/content/zotero/xpcom/integration.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 9c0010960..dcd18d71d 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -628,7 +628,8 @@ Zotero.Integration.Document.prototype._getSession = function(require, dontRunSet
 			} catch(e) {
 				// make sure style is defined
 				if(e instanceof Zotero.Integration.DisplayException && e.name === "invalidStyle") {
-					this._session.setDocPrefs(this._doc, this._app.primaryFieldType, this._app.secondaryFieldType, function() {
+					this._session.setDocPrefs(this._doc, this._app.primaryFieldType,
+							this._app.secondaryFieldType, function() {
 						me._doc.setDocumentData(me._session.data.serializeXML());
 						me._session.reload = true;
 						callback(true);
@@ -779,7 +780,8 @@ Zotero.Integration.Document.prototype.setDocPrefs = function() {
 	var me = this;
 	this._getSession(false, true, function(haveSession) {
 		var setDocPrefs = function() {
-			me._session.setDocPrefs(me._app.primaryFieldType, me._app.secondaryFieldType, function(oldData) {
+			me._session.setDocPrefs(me._doc, me._app.primaryFieldType, me._app.secondaryFieldType,
+			function(oldData) {
 				if(oldData || oldData === null) {
 					me._doc.setDocumentData(me._session.data.serializeXML());
 					if(oldData === null) return;
@@ -1643,7 +1645,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp
 	}
 	
 	var me = this;
-	Zotero.Integration.displayDialog(this._doc,
+	Zotero.Integration.displayDialog(doc,
 		'chrome://zotero/content/integration/integrationDocPrefs.xul', '', io, function() {
 		if(!io.style) {
 			callback(false);