From e0e4699c3e33fd9dcb9f00ab2ddb440067ebd9a9 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Sat, 22 Sep 2012 18:43:13 -0500
Subject: [PATCH] Fix cleanDOI

Conflicts:
	chrome/content/zotero/xpcom/utilities.js
---
 chrome/content/zotero/locale/csl         | 2 +-
 chrome/content/zotero/xpcom/utilities.js | 3 ++-
 translators                              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 2288e745e7..36d26a584a 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 2288e745e7c13cac7a78bb294d09cf19ad2cf23e
+Subproject commit 36d26a584ac869f2dfbdd528f57141a3bbcf016f
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index b7df62eb92..a77a89388b 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -262,7 +262,8 @@ Zotero.Utilities = {
 			throw "cleanDOI: argument must be a string";
 		}
 		
-		return x.match(/10\.[0-9]{4,}\/[^\s]*[^\s\.,]/);
+		var doi = x.match(/10\.[0-9]{4,}\/[^\s]*[^\s\.,]/);
+		return doi ? doi[0] : null;
 	},
 
 	/**
diff --git a/translators b/translators
index af463b24e4..a685b279c6 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit af463b24e40f0b426a40b55cf5f0d74dcab0d5b0
+Subproject commit a685b279c61b5c1b1368ea7997fc2b4914eedf8a