From 0357212de322ebefdf1d9ea58fd00b9f87655837 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Tue, 16 Jun 2015 20:45:37 +0000 Subject: VKontakte: fix bbc for muc git-svn-id: http://svn.miranda-ng.org/main/trunk@14223 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/misc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/VKontakte/src/misc.cpp') diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 9d59f68017..b92c72c83d 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -1035,7 +1035,7 @@ CMString CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport const JSONNode &jnSubAttachments = jnWall["attachments"]; if (!jnSubAttachments.isnull()) { debugLogA("CVkProto::GetAttachmentDescr SubAttachments"); - CMString tszAttachmentDescr = GetAttachmentDescr(jnSubAttachments, m_iBBCForAttachments); + CMString tszAttachmentDescr = GetAttachmentDescr(jnSubAttachments, iBBC); tszAttachmentDescr.Replace(_T("\n"), _T("\n\t")); res += _T("\n\t") + tszAttachmentDescr; } @@ -1150,7 +1150,7 @@ CMString CVkProto::GetFwdMessages(const JSONNode &jnMessages, BBCSupport iBBC) const JSONNode &jnFwdMessages = jnMsg["fwd_messages"]; if (!jnFwdMessages.isnull()) { - CMString tszFwdMessages = GetFwdMessages(jnFwdMessages, m_iBBCForAttachments); + CMString tszFwdMessages = GetFwdMessages(jnFwdMessages, iBBC == bbcNo ? iBBC : m_iBBCForAttachments); if (!tszBody.IsEmpty()) tszFwdMessages = _T("\n") + tszFwdMessages; tszBody += tszFwdMessages; @@ -1158,7 +1158,7 @@ CMString CVkProto::GetFwdMessages(const JSONNode &jnMessages, BBCSupport iBBC) const JSONNode &jnAttachments = jnMsg["attachments"]; if (!jnAttachments.isnull()) { - CMString tszAttachmentDescr = GetAttachmentDescr(jnAttachments, m_iBBCForAttachments); + CMString tszAttachmentDescr = GetAttachmentDescr(jnAttachments, iBBC == bbcNo ? iBBC : m_iBBCForAttachments); if (!tszBody.IsEmpty()) tszAttachmentDescr = _T("\n") + tszAttachmentDescr; tszBody += tszAttachmentDescr; -- cgit v1.2.3