www

commit b232106526069091fe885675882c01d93a2211aa
parent 4ff9fada053e9fdf8d3d452552840f4e5122a550
Author: Simon Kornblith <simon@simonster.com>
Date:   Thu, 11 Aug 2011 04:06:45 +0000

- XPCOM errors use "filename" instead of "fileName" for some ungodly reason
- Fix verison


Diffstat:
M
chrome/content/zotero/xpcom/server_connector.js
 | 
2
+-
M
chrome/content/zotero/xpcom/zotero.js
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
@@ -512,7 +512,7 @@ Zotero.Server.Connector.IncompatibleVersion.prototype = {
 		ps.alert(null,
 			Zotero.getString("connector.error.title"),
 			Zotero.getString("integration.error.incompatibleVersion2",
-				["Standalone "+Zotero.version, "Connector", "2.1.999"]));
+				["Standalone "+Zotero.version, "Connector", "2.999.1"]));
 		Zotero.Server.Connector.IncompatibleVersion._errorShown = true;
 	}
 };
 \ No newline at end of file
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -1145,7 +1145,7 @@ if(appInfo.platformVersion[0] >= 2) {
 	 */
 	function logError(err) {
 		log(err.message ? err.message : err.toString(), "error",
-			err.fileName ? err.fileName : null, null,
+			err.fileName ? err.fileName : (err.filename ? err.filename : null), null,
 			err.lineNumber ? err.lineNumber : null, null);
 	}