summaryrefslogtreecommitdiff
path: root/protocols/FacebookRM/src/json.cpp
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2015-02-06 10:00:00 +0000
committerRobert Pösel <robyer@seznam.cz>2015-02-06 10:00:00 +0000
commit57890ac884743d836690db5058185db1e6dea5d8 (patch)
tree937ab0cd988dddc58de40135a7c825227440e086 /protocols/FacebookRM/src/json.cpp
parent1d9a2d26d7b7b458d7e65a683e7ca3d7506ced8b (diff)
Facebook: Fix loading sent messages via other instances (website) to wrong contact in Miranda; Version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@12018 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src/json.cpp')
-rw-r--r--protocols/FacebookRM/src/json.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index 3a08e928fa..b24afdb330 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -557,7 +557,7 @@ int facebook_json_parser::parse_messages(std::string *data, std::vector< faceboo
if (!message->isChat && !message->isIncoming) {
message->sender_name.clear();
- message->user_id = proto->ThreadIDToContactID(message->thread_id); // TODO: Check if we have contact with this user_id in friendlist and otherwise do something different?
+ message->user_id = !other_user_id.empty() ? other_user_id : proto->ThreadIDToContactID(message->thread_id); // TODO: Check if we have contact with this user_id in friendlist and otherwise do something different?
}
messages->push_back(message);