summaryrefslogtreecommitdiff
path: root/users/app/models
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-07 09:51:27 -0800
committerjessib <jessib@riseup.net>2014-01-07 09:51:27 -0800
commitb920c144ef70613414a702e468ab7889659a03da (patch)
tree02f2567f8a4eaf01b8984498f26bd56dbc42af08 /users/app/models
parent0f803750a8540ce2e52c508acdd7279b9e85b507 (diff)
parent566eee7fa3433af443ffe99449377ab935b8fcc7 (diff)
Merge branch 'develop' into feature/messages_api
Diffstat (limited to 'users/app/models')
-rw-r--r--users/app/models/identity.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/users/app/models/identity.rb b/users/app/models/identity.rb
index cbb540e..9b97b51 100644
--- a/users/app/models/identity.rb
+++ b/users/app/models/identity.rb
@@ -24,7 +24,9 @@ class Identity < CouchRest::Model::Base
if (doc.type != 'Identity') {
return;
}
- emit(doc.address, doc.keys["pgp"]);
+ if (typeof doc.keys === "object") {
+ emit(doc.address, doc.keys["pgp"]);
+ }
}
EOJS
view :disabled,