Merge branch 'master' of github.com:havard/node-openid

havard · Feb 19, 2011 · 7fde90f · 7fde90f
2 parents 9802f3c + 2e6117a
commit 7fde90f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/openid.js b/openid.js
@@ -350,7 +350,7 @@ function _matchMetaTag(html)
 
 function _matchLinkTag(html, rel)
 {
-  var providerLinkMatches = new RegExp('<link\\s+.*?rel="' + rel + '".*?>', 'ig').exec(html);
+  var providerLinkMatches = new RegExp('<link\\s+.*?rel="[^"]*?' + rel + '[^"]*?".*?>', 'ig').exec(html);
 
   if(!providerLinkMatches || providerLinkMatches.length < 1)
   {
@@ -616,6 +616,10 @@ openid.associate = function(provider, callback, strict, algorithm)
         callback(data);
       }
     }
+    else if (data.error)
+    {
+      callback(data);
+    }
     else
     {
       var secret = null;