www

commit 1ed47f48235d958baf7989d30957a2d774bb2fd0
parent c0823e0b7d9ebcb0901025644ccfa31394e53ebf
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 29 Oct 2012 15:54:44 -0400

Merge branch '3.0'

Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/utilities.js

Diffstat:
M
chrome/content/zotero/xpcom/attachments.js
 | 
2
++
M
chrome/content/zotero/xpcom/data/itemFields.js
 | 
1
+

2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
@@ -359,6 +359,8 @@ Zotero.Attachments = new function(){
 					wbp.saveURI(nsIURL, null, null, null, null, file, null);
 				}
 				
+				if(callback) callback(attachmentItem);
+				
 				return attachmentItem;
 			}
 			catch (e){
diff --git a/chrome/content/zotero/xpcom/data/itemFields.js b/chrome/content/zotero/xpcom/data/itemFields.js
@@ -315,6 +315,7 @@ Zotero.ItemFields = new function() {
 			'archive',
 			'archiveLocation',
 			'language',
+			'programmingLanguage',
 			'rights',
 			
 			// TEMP - NSF