Commit 012f8f76 authored by strong's avatar strong

Merge branch 'remould_1011_user_deduplication' into SANDBOX

parents b9a6dbce 283e1167
......@@ -1017,7 +1017,7 @@ function getMobileSubThreads(doc, sort, callback) {
_.forEach(docs, function(one, i) {
var flag = true;
_.forEach(list, function(two, k) {
if(one.from._id == two.from._id){
if(one.from && two.from && one.from._id == two.from._id){
flag = false;
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment